diff --git a/archachatina.nix b/archachatina.nix
index debf789..78a836f 100644
--- a/archachatina.nix
+++ b/archachatina.nix
@@ -14,6 +14,7 @@
       ./v4l2loopback.nix
       ./huion.nix
       ./rtl8761b.nix
+      ./unstable-nix.nix
     ];
 
   environment.etc."lvm/lvm.conf".text = ''
@@ -125,6 +126,4 @@
 
   system.stateVersion = "18.03";
 
-  nix.package = pkgs.nixUnstable;
-
 }
diff --git a/common-headless.nix b/common-headless.nix
index 211f6cb..8f681df 100644
--- a/common-headless.nix
+++ b/common-headless.nix
@@ -16,7 +16,6 @@
   nix.extraOptions = ''
     auto-optimise-store = true
     binary-caches-parallel-connections = 10
-    experimental-features = flakes nix-command
   '';
 
   networking.networkmanager.enable = true;
diff --git a/petalius.nix b/petalius.nix
index ffbf2e9..e1a18e0 100644
--- a/petalius.nix
+++ b/petalius.nix
@@ -12,6 +12,7 @@
       ./atmega.nix
       ./v4l2loopback.nix
       ./huion.nix
+      ./unstable-nix.nix
     ];
 
   environment.etc."lvm/lvm.conf".text = ''
diff --git a/unstable-nix.nix b/unstable-nix.nix
new file mode 100644
index 0000000..79cc6fa
--- /dev/null
+++ b/unstable-nix.nix
@@ -0,0 +1,11 @@
+{ config, pkgs, ... }:
+
+{
+
+  nix.package = pkgs.nixUnstable;
+
+  nix.extraOptions = ''
+    experimental-features = flakes nix-command
+  '';
+
+}