diff --git a/flake.nix b/flake.nix
index fe1c6019..4c0881d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -188,21 +188,17 @@
 
       ## Personal
 
-      Northstar = let
+      Northstar = systemConfig {
         hostName = "Northstar";
-        system = "x86_64-linux";
-      in
-        systemConfig {
-          inherit hostName system;
-          systemModules = [
-            ./system/laptop.nix
-            ./system/hyprland.nix
-            ./system/games.nix
-          ];
-          homeModules = [
-            ./home/hyprland/default.nix
-          ];
-        };
+        systemModules = [
+          ./system/laptop.nix
+          ./system/hyprland.nix
+          ./system/games.nix
+        ];
+        homeModules = [
+          ./home/hyprland/default.nix
+        ];
+      };
 
       Vanguard = systemConfig {
         hostName = "Vanguard";
@@ -218,36 +214,28 @@
 
       ## Work
 
-      Ronin = let
+      Ronin = systemConfig {
         hostName = "Ronin";
         user = "elitherl";
-        system = "x86_64-linux";
-      in
-        systemConfig {
-          inherit hostName user system;
-          systemModules = [
-            ./system/laptop.nix
-            ./system/hyprland.nix
-          ];
-          homeModules = [
-            ./home/hyprland/default.nix
-          ];
-        };
+        systemModules = [
+          ./system/laptop.nix
+          ./system/hyprland.nix
+        ];
+        homeModules = [
+          ./home/hyprland/default.nix
+        ];
+      };
 
-      Scorch = let
+      Scorch = systemConfig {
         hostName = "Scorch";
         user = "elitherl";
-        system = "x86_64-linux";
-      in
-        systemConfig {
-          inherit hostName user system;
-          systemModules = [
-            ./system/hyprland.nix
-          ];
-          homeModules = [
-            ./home/hyprland/default.nix
-          ];
-        };
+        systemModules = [
+          ./system/hyprland.nix
+        ];
+        homeModules = [
+          ./home/hyprland/default.nix
+        ];
+      };
     };
   };
 }