diff --git a/hosts/common.nix b/hosts/common.nix
index dacdeb5..577ebed 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -5,8 +5,6 @@
     ../wrappers
   ];
 
-  system.stateVersion = "23.11";
-
   nix.settings = {
     experimental-features = [
       "nix-command"
diff --git a/hosts/inspiron/default.nix b/hosts/inspiron/default.nix
index 6f1918c..24faa06 100644
--- a/hosts/inspiron/default.nix
+++ b/hosts/inspiron/default.nix
@@ -6,6 +6,8 @@
   ];
 
   networking.hostName = "inspiron";
+  system.stateVersion = "23.11";
+  boot.kernelPackages = pkgs.linuxPackages_latest;
 
   myConfig = {
     boot = {
@@ -32,7 +34,5 @@
     tailscale.enable = true;
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-
   services.auto-cpufreq.enable = true;
 }
diff --git a/hosts/north/default.nix b/hosts/north/default.nix
index 985f776..99b0f64 100644
--- a/hosts/north/default.nix
+++ b/hosts/north/default.nix
@@ -6,6 +6,8 @@
   ];
 
   networking.hostName = "north";
+  system.stateVersion = "23.11";
+  boot.kernelPackages = pkgs.linuxPackages_6_8;
 
   myConfig = {
     boot = {
@@ -31,7 +33,5 @@
     };
   };
 
-  boot.kernelPackages = pkgs.linuxPackages_6_8;
-
   programs.steam.enable = true;
 }
diff --git a/users/common.nix b/users/common.nix
index d8aad40..3f451bb 100644
--- a/users/common.nix
+++ b/users/common.nix
@@ -16,7 +16,6 @@
 
     {
       programs.home-manager.enable = true;
-      home.stateVersion = "23.11";
       systemd.user.startServices = "sd-switch";
 
       xdg = {
diff --git a/users/seb/@inspiron.nix b/users/seb/@inspiron.nix
index 8305788..19db300 100644
--- a/users/seb/@inspiron.nix
+++ b/users/seb/@inspiron.nix
@@ -3,8 +3,8 @@
   imports = [ ./default.nix ];
 
   home-manager.users.seb = {
-    home.packages = [ wrappers.hyprlock ];
-
+    home.stateVersion = "23.11";
     myConfig.theme = "light";
+    home.packages = [ wrappers.hyprlock ];
   };
 }
diff --git a/users/seb/@north.nix b/users/seb/@north.nix
index c4a2fde..ec0f2a1 100644
--- a/users/seb/@north.nix
+++ b/users/seb/@north.nix
@@ -3,13 +3,13 @@
   imports = [ ./default.nix ];
 
   home-manager.users.seb = {
+    home.stateVersion = "23.11";
+    myConfig.theme = "dark";
     home.packages = [
       pkgs.ffmpeg
       pkgs.obs-studio
       pkgs.davinci-resolve
       pkgs.gimp
     ];
-
-    myConfig.theme = "dark";
   };
 }