diff --git a/hosts/tower/boot/default.nix b/hosts/tower/boot/default.nix
index 46bf7b6..5d87331 100644
--- a/hosts/tower/boot/default.nix
+++ b/hosts/tower/boot/default.nix
@@ -1,4 +1,4 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgsUnstable, ... }:
 let
   commonKernelParams = [
     # VM/GPU passthrough
@@ -16,7 +16,7 @@ let
 in {
   boot = {
     # Something something Zen or Xanmod for IOMMU isolation something zfs
-    kernelPackages = pkgs.unstable.linuxPackages_xanmod_stable;
+    kernelPackages = pkgsUnstable.linuxPackages_xanmod_stable;
     kernelParams = commonKernelParams ++ [ "vfio-pci.ids=10de:1f82,10de:10fa" ];
 
     # Needed for GPU passthrough
diff --git a/modules/extras/default.nix b/modules/extras/default.nix
deleted file mode 100644
index 82d0015..0000000
--- a/modules/extras/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./overlays
-    ./variables
-  ];
-}
diff --git a/modules/extras/overlays/default.nix b/modules/extras/overlays/default.nix
deleted file mode 100644
index 3086ea3..0000000
--- a/modules/extras/overlays/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  imports = [ ./unstable ];
-}
diff --git a/modules/extras/overlays/unstable/default.nix b/modules/extras/overlays/unstable/default.nix
deleted file mode 100644
index cdd4a8c..0000000
--- a/modules/extras/overlays/unstable/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ unstable, ... }:
-{
-  nixpkgs.overlays = [
-    (final: prev: {
-      unstable = import unstable {
-        system = final.system;
-        config.allowUnfree = true;
-      };
-    })
-  ];
-}
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 49ce879..9caad19 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -7,7 +7,7 @@
     ./settings
     ./wms
     ./user
-    ../extras
+    ../variables
 
     # Imports
     nur.modules.homeManager.default
diff --git a/modules/home/settings/nix/default.nix b/modules/home/settings/nix/default.nix
index 81b80b5..fbf9d3f 100644
--- a/modules/home/settings/nix/default.nix
+++ b/modules/home/settings/nix/default.nix
@@ -1,11 +1,16 @@
-{ unstable, lib, pkgs, ... }:
+{ config, lib, pkgs, unstable, ... }:
 {
   nix = {  
     package = lib.mkForce pkgs.nix;
-    registry.unstable.flake = unstable;
     settings.experimental-features = [
       "nix-command"
       "flakes"
     ];
+    registry.unstable.flake = unstable;
+  };
+
+  _module.args.pkgsUnstable = import unstable {
+    inherit (pkgs.stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
   };
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index e27a548..093519d 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -7,7 +7,7 @@
     ./secrets
     ./services
     ./settings
-    ../extras
+    ../variables
   ];
 
   options.system = with lib; {
diff --git a/modules/system/settings/nix/default.nix b/modules/system/settings/nix/default.nix
index 9c3e0bf..862bef7 100644
--- a/modules/system/settings/nix/default.nix
+++ b/modules/system/settings/nix/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ config, pkgs, unstable, ... }:
 {
   imports = [ ./gc ];
 
@@ -9,4 +9,9 @@
     ];
     auto-optimise-store = true;
   };
+
+  _module.args.pkgsUnstable = import unstable {
+    inherit (pkgs.stdenv.hostPlatform) system;
+    inherit (config.nixpkgs) config;
+  };
 }
diff --git a/modules/extras/variables/default.nix b/modules/variables/default.nix
similarity index 100%
rename from modules/extras/variables/default.nix
rename to modules/variables/default.nix
diff --git a/modules/extras/variables/displays/default.nix b/modules/variables/displays/default.nix
similarity index 100%
rename from modules/extras/variables/displays/default.nix
rename to modules/variables/displays/default.nix
diff --git a/modules/extras/variables/domains/default.nix b/modules/variables/domains/default.nix
similarity index 100%
rename from modules/extras/variables/domains/default.nix
rename to modules/variables/domains/default.nix
diff --git a/modules/extras/variables/ips/default.nix b/modules/variables/ips/default.nix
similarity index 100%
rename from modules/extras/variables/ips/default.nix
rename to modules/variables/ips/default.nix
diff --git a/modules/extras/variables/look/border/default.nix b/modules/variables/look/border/default.nix
similarity index 100%
rename from modules/extras/variables/look/border/default.nix
rename to modules/variables/look/border/default.nix
diff --git a/modules/extras/variables/look/colors/default.nix b/modules/variables/look/colors/default.nix
similarity index 100%
rename from modules/extras/variables/look/colors/default.nix
rename to modules/variables/look/colors/default.nix
diff --git a/modules/extras/variables/look/default.nix b/modules/variables/look/default.nix
similarity index 100%
rename from modules/extras/variables/look/default.nix
rename to modules/variables/look/default.nix
diff --git a/modules/extras/variables/look/fonts/default.nix b/modules/variables/look/fonts/default.nix
similarity index 100%
rename from modules/extras/variables/look/fonts/default.nix
rename to modules/variables/look/fonts/default.nix
diff --git a/modules/extras/variables/users/default.nix b/modules/variables/users/default.nix
similarity index 100%
rename from modules/extras/variables/users/default.nix
rename to modules/variables/users/default.nix
diff --git a/modules/extras/variables/workspaces/default.nix b/modules/variables/workspaces/default.nix
similarity index 100%
rename from modules/extras/variables/workspaces/default.nix
rename to modules/variables/workspaces/default.nix