diff --git a/applications/devel-rust.nix b/applications/devel-rust.nix
index 440abf0..556cf06 100644
--- a/applications/devel-rust.nix
+++ b/applications/devel-rust.nix
@@ -5,7 +5,7 @@
     # Use rustup to get the compiler
     rustup
     # Install the latest rust analyzer
-    fenix.rust-analyzer
+    fenix.packages."${system}".rust-analyzer
     # Sccache for faster builds
     sccache
     # Misc cargo utilites
diff --git a/flake.nix b/flake.nix
index 298aa19..6e194b3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,7 +51,7 @@
     , darwin
     , polymc
     , nix-doom-emacs
-    }:
+    }@attrs:
     let
       baseModules = [
         ./applications/utils-core.nix
@@ -161,9 +161,8 @@
               overlays = [ mozillaOverlay ];
               system = "x86_64-linux";
             };
-            fenix = fenix.packages.x86_64-linux;
             doomEmacs = nix-doom-emacs.hmModule;
-          };
+          } // attrs;
           modules = [
             ./hardware/levitation.nix
             ./machines/levitation.nix
@@ -180,8 +179,7 @@
               overlays = [ ];
               system = "x86_64-linux";
             };
-            fenix = fenix.packages.x86_64-linux;
-          };
+          } // attrs;
           modules = [
             ./hardware/oracles.nix
             ./machines/oracles.nix
@@ -201,8 +199,7 @@
               overlays = [ ];
               system = "x86_64-linux";
             };
-            fenix = fenix.packages.x86_64-linux;
-          };
+          } // attrs;
           modules = [
             ./hardware/perception.nix
             ./machines/perception.nix
@@ -220,8 +217,7 @@
               overlays = [ ];
               system = "x86_64-linux";
             };
-            fenix = fenix.packages.x86_64-linux;
-          };
+          } // attrs;
           modules = [
             ./hardware/shadowchild.nix
             ./machines/shadowchild.nix
@@ -237,8 +233,7 @@
               overlays = [ ];
               system = "x86_64-linux";
             };
-            fenix = fenix.packages.x86_64-linux;
-          };
+          } // attrs;
           modules = [
             ./hardware/matrix.nix
             ./machines/matrix.nix
@@ -256,8 +251,7 @@
               overlays = [ ];
               system = "x86_64-linux";
             };
-            fenix = fenix.packages.x86_64-linux;
-          };
+          } // attrs;
           modules = [ ./home-linux.nix ] ++ desktopModules;
         };
       };
@@ -270,9 +264,8 @@
               overlays = [ ];
               system = "x86_64-darwin";
             };
-            fenix = fenix.packages.x86_64-darwin;
             doomEmacs = nix-doom-emacs.hmModule;
-          };
+          } // attrs;
           modules = baseModules ++ baseHomeModules ++ [
             ./darwin-modules/base.nix
             home-manager.darwinModules.home-manager
diff --git a/modules/games.nix b/modules/games.nix
index 9856387..e2c4314 100644
--- a/modules/games.nix
+++ b/modules/games.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }: {
+{ pkgs, nixpkgs-unstable, ... }: {
   environment.systemPackages =
     let
       # https://github.com/Admicos/minecraft-wayland
@@ -8,14 +8,19 @@
           ../patches/minecraft/0004-wayland-fix-broken-opengl-screenshots-on-mutter.patch
         ];
       });
+      stable-packages = with pkgs; [
+        # Dwarf fortress
+        (dwarf-fortress-packages.dwarf-fortress-full.override {
+          enableFPS = true;
+        })
+        # PolyMC minecraft stuff
+        polymc
+        glfw-patched
+      ];
+      unstable-packages = with nixpkgs-unstable.legacyPackages."${pkgs.system}"; [
+        # Packwiz for maintaing modpacks
+        packwiz
+      ];
     in
-    with pkgs; [
-      # Dwarf fortress
-      (dwarf-fortress-packages.dwarf-fortress-full.override {
-        enableFPS = true;
-      })
-      # PolyMC minecraft stuff
-      polymc
-      glfw-patched
-    ];
+    stable-packages ++ unstable-packages;
 }