diff --git a/overlays/default.nix b/overlays/default.nix
index 9f2b4bb..2c584e6 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -65,9 +65,6 @@
       patches = old.patches
         ++ [ ../patches/sway/fix-hide_cursor-clearing-focus.patch ];
     });
-    steam = prev.unstable.steam.override {
-      extraPkgs = pkgs: with pkgs; [ capitaine-cursors bibata-cursors mangohud ];
-    };
 
     qutebrowser = prev.qutebrowser.overrideAttrs (old: {
       src = prev.fetchFromGitHub {
diff --git a/system/steam.nix b/system/steam.nix
index 3abd976..b10f2ca 100644
--- a/system/steam.nix
+++ b/system/steam.nix
@@ -1,6 +1,26 @@
-{ config, pkgs, inputs, ... }: {
+{ config, pkgs, inputs, ... }:
+let
+  upkgs = pkgs.unstable;
+in
+{
   programs.steam.enable = true;
-  environment.systemPackages = with pkgs; [
+  programs.steam.package = upkgs.steam.override {
+    extraLibraries = pkgs: with config.hardware.opengl;
+      if pkgs.hostPlatform.is64bit
+      then [ package ] ++ extraPackages
+      else [ package32 ] ++ extraPackages32;
+
+    extraPkgs = pkgs: with pkgs; [
+      capitaine-cursors
+      bibata-cursors
+      mangohud
+      xdg-user-dirs
+    ];
+    extraProfile = ''
+      export GSETTINGS_SCHEMA_DIR="${upkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${upkgs.gsettings-desktop-schemas.name}/glib-2.0/schemas/"
+    '';
+  };
+  environment.systemPackages = with upkgs; [
     protontricks
   ];
 }