diff --git a/hosts/caramel/default.nix b/hosts/caramel/default.nix
index 74d41ab..5c49e38 100644
--- a/hosts/caramel/default.nix
+++ b/hosts/caramel/default.nix
@@ -13,7 +13,7 @@
     base
     home-manager
     input
-    nix
+    nix-porcupine
     security
 
     ./filesystem.nix
diff --git a/hosts/sugarcane/default.nix b/hosts/sugarcane/default.nix
index ed36355..e5c34bd 100644
--- a/hosts/sugarcane/default.nix
+++ b/hosts/sugarcane/default.nix
@@ -13,7 +13,7 @@
     base
     home-manager
     input
-    nix
+    nix-porcupine
     security
 
     ./filesystem.nix
diff --git a/modules/default.nix b/modules/default.nix
index 4e2ff10..51aa449 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -23,6 +23,7 @@ in {
     ./system/input.nix
     ./system/kernel.nix
     ./system/nix.nix
+    ./system/nix-porcupine.nix
     ./system/packages.nix
     ./system/security.nix
     ./system/snapper.nix
diff --git a/modules/system/nix-porcupine.nix b/modules/system/nix-porcupine.nix
new file mode 100644
index 0000000..cb96b40
--- /dev/null
+++ b/modules/system/nix-porcupine.nix
@@ -0,0 +1,19 @@
+{ config, lib, pkgs, ... }: {
+  nix = rec {
+    package = pkgs.nix_2_4;
+    binaryCaches = [
+      "https://cache.nixos.org?priority=10"
+      "https://lava.cachix.org"
+    ];
+    binaryCachePublicKeys = [
+      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+      "lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0="
+    ];
+    trustedBinaryCaches = binaryCaches;
+
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
+  nixpkgs.config.allowUnfree = true;
+}
diff --git a/modules/system/nix.nix b/modules/system/nix.nix
index f32e2d8..3152bb9 100644
--- a/modules/system/nix.nix
+++ b/modules/system/nix.nix
@@ -1,17 +1,20 @@
 { config, lib, pkgs, ... }: {
-  nix = rec {
+  nix = {
     package = pkgs.nixUnstable;
-    binaryCaches = [
-      "https://cache.nixos.org?priority=10"
-      "https://lava.cachix.org"
-      "https://nix-gaming.cachix.org"
-    ];
-    binaryCachePublicKeys = [
-      "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-      "lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0="
-      "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
-    ];
-    trustedBinaryCaches = binaryCaches;
+
+    settings = rec {
+      substituters = [
+        "https://cache.nixos.org?priority=10"
+        "https://lava.cachix.org"
+        "https://nix-gaming.cachix.org"
+      ];
+      trusted-public-keys = [
+        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
+        "lava.cachix.org-1:8lTWI/3IKWHByzzYHZySunMPYs2eAJw2duL+uLZkSy0="
+        "nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
+      ];
+      trusted-substituters = substituters;
+    };
 
     extraOptions = ''
       experimental-features = nix-command flakes