diff --git a/machines/SteamDeck/configuration.nix b/machines/SteamDeck/configuration.nix
index 930782a..0319993 100755
--- a/machines/SteamDeck/configuration.nix
+++ b/machines/SteamDeck/configuration.nix
@@ -24,8 +24,6 @@
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
 
-	nix.settings.auto-optimise-store = true;
-
 	# Configure network proxy if necessary
 	# networking.proxy.default = "http://user:password@proxy:port/";
 	# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix
index c385e37..fe960af 100755
--- a/machines/WinMax2/configuration.nix
+++ b/machines/WinMax2/configuration.nix
@@ -63,8 +63,6 @@ ACTION=="add", SUBSYSTEM=="i2c", ATTR{name}=="PNP0C50:00", ATTR{power/wakeup}="d
 	# Allow unfree packages
 	nixpkgs.config.allowUnfree = true;
 
-	nix.settings.auto-optimise-store = true;
-
 	# Configure network proxy if necessary
 	# networking.proxy.default = "http://user:password@proxy:port/";
 	# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
diff --git a/roles/common/programs/nix.nix b/roles/common/programs/nix.nix
index 07e90d7..fd36171 100755
--- a/roles/common/programs/nix.nix
+++ b/roles/common/programs/nix.nix
@@ -2,9 +2,10 @@
 
 {
 	nix = {
-		extraOptions = ''
-experimental-features = nix-command flakes
-		'';
+		settings = {
+			auto-optimise-store = true;
+			experimental-features = "nix-command flakes";
+		};
 		registry = {
 			agenix = {
 				from = { id = "agenix"; type = "indirect"; };