diff --git a/hosts/miku.nix b/hosts/miku.nix
index 0b23197..c9e4b6f 100644
--- a/hosts/miku.nix
+++ b/hosts/miku.nix
@@ -18,49 +18,8 @@
       rev = "ce0e9482d53d69bedc8416d8a984d00e17607826";
     }))
 
-   #(import (builtins.fetchTarball {
-   #  url = "https://github.com/nix-community/NUR/archive/master.tar.gz";
-   #  sha256 = "0r2pcc6sjxmhg1xxk23648wrwccv2c5v44cfwglx35az5y0hmr1f";
-   #}))
-
     # Steam overlay
-    # TODO: Replace with the commented out version below
-    (final: prev: let
-      buildFHSUserEnvBubblewrap = prev.callPackage ../packages/build-support/build-fhs-userenv-bubblewrap {};
-      steamPackages = lib.dontRecurseIntoAttrs (prev.callPackage ../packages/games/steam {
-        buildFHSUserEnv = buildFHSUserEnvBubblewrap;
-      });
-    in {
-      buildFHSUserEnvBubblewrap = buildFHSUserEnvBubblewrap;
-      steamPackages = steamPackages;
-      steam = steamPackages.steam-fhsenv.override {
-        extraPkgs = pkgs: with pkgs; [ gamemode ];
-      };
-    })
-   #(final: prev:
-   #  let
-   #    # NOTE: This is a really messy solution
-   #    buildFHSUserEnvBubblewrap = prev.callPackage ../packages/build-support/build-fhs-userenv-bubblewrap {};
-   #  in {
-   #    steamPackages = prev.steamPackages.override {
-   #      buildFHSUserEnv = buildFHSUserEnvBubblewrap;
-   #      # Include gamemode in the FHS
-   #      #extraPkgs = (pkgs: with pkgs; [ gamemode ]);
-   #    };
-
-   #    steam = prev.steamPackages.steam-fhsenv.overrideAttrs (old: {
-   #      specifyHomeDirs = true;
-   #      chdirTo = "/home/$USER";
-   #    });
-   #   #steam = final.steamPackages.steam-fhsenv.override {
-   #   #  extraPkgs = pkgs: with pkgs; [ gamemode ];
-   #   #};
-   #    steam-run = final.steam.run;
-   #    steam-run-native = (final.steam.override {
-   #      nativeOnly = true;
-   #    });
-   #    steamcmd = final.steamPackages.steamcmd;
-   #  })
+    (import ../overlays/steam.nix pkgs)
 
     # Simple overrides
     (final: prev: {
diff --git a/overlays/steam.nix b/overlays/steam.nix
new file mode 100644
index 0000000..ab846cd
--- /dev/null
+++ b/overlays/steam.nix
@@ -0,0 +1,39 @@
+pkgs: final: prev:
+
+# TODO: Replace with the commented out version below
+let
+  buildFHSUserEnvBubblewrap = prev.callPackage ../packages/build-support/build-fhs-userenv-bubblewrap {};
+  steamPackages = lib.dontRecurseIntoAttrs (prev.callPackage ../packages/games/steam {
+    buildFHSUserEnv = buildFHSUserEnvBubblewrap;
+  });
+in {
+  buildFHSUserEnvBubblewrap = buildFHSUserEnvBubblewrap;
+  steamPackages = steamPackages;
+  steam = steamPackages.steam-fhsenv.override {
+    extraPkgs = pkgsx: with pkgsx; [ gamemode ];
+  };
+
+   #(final: prev:
+   #  let
+   #    # NOTE: This is a really messy solution
+   #    buildFHSUserEnvBubblewrap = prev.callPackage ../packages/build-support/build-fhs-userenv-bubblewrap {};
+   #  in {
+   #    steamPackages = prev.steamPackages.override {
+   #      buildFHSUserEnv = buildFHSUserEnvBubblewrap;
+   #      # Include gamemode in the FHS
+   #      #extraPkgs = (pkgs: with pkgs; [ gamemode ]);
+   #    };
+
+   #    steam = prev.steamPackages.steam-fhsenv.overrideAttrs (old: {
+   #      specifyHomeDirs = true;
+   #      chdirTo = "/home/$USER";
+   #    });
+   #   #steam = final.steamPackages.steam-fhsenv.override {
+   #   #  extraPkgs = pkgs: with pkgs; [ gamemode ];
+   #   #};
+   #    steam-run = final.steam.run;
+   #    steam-run-native = (final.steam.override {
+   #      nativeOnly = true;
+   #    });
+   #    steamcmd = final.steamPackages.steamcmd;
+   #  })