diff --git a/flake.lock b/flake.lock
index 200067f..0005f62 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1186,16 +1186,16 @@
     },
     "systems_6": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
         "owner": "nix-systems",
-        "repo": "default-linux",
+        "repo": "default",
         "type": "github"
       }
     },
diff --git a/flake.nix b/flake.nix
index 5ca0dd0..470ee40 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,7 +96,7 @@
     };
 
     # Systems
-    systems.url = "github:nix-systems/default-linux";
+    systems.url = "github:nix-systems/default";
   };
 
   outputs =
diff --git a/hosts/default.nix b/hosts/default.nix
index b6308b6..a45a3f6 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -14,4 +14,16 @@
       "workload.tailscale.client"
     ];
   };
+
+  m2 = {
+    system = "aarch64-darwin";
+    stateVersion = "26.05";
+    user = "moons";
+    path = ./m2;
+
+    profiles = [
+      "base"
+      "interface.cli-minimal"
+    ];
+  };
 }
diff --git a/libs/hosts.nix b/libs/hosts.nix
index 4236472..c50caa6 100644
--- a/libs/hosts.nix
+++ b/libs/hosts.nix
@@ -145,7 +145,10 @@ let
       modules = [
         (registry.mkModule { class = "darwin"; })
         (registry.mkSelectionModule selected)
-        { networking.hostName = lib.mkDefault name; }
+        {
+          networking.hostName = lib.mkDefault name;
+          system.primaryUser = lib.mkDefault spec.user;
+        }
       ]
       ++ lib.optional (spec.homeManager or true) (mkDarwinHomeManagerModule name spec selected)
       ++ lib.optional (darwinPath != null) darwinPath;