diff --git a/flake.nix b/flake.nix
index 2dbbe9a..9f342f5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,34 +29,19 @@
       ...
     }:
     {
-      darwinConfigurations."larstvei-macbookpro" = darwin.lib.darwinSystem {
-        system = "aarch64-darwin";
+      darwinConfigurations = {
+        larstvei-macbookpro = darwin.lib.darwinSystem {
+          system = "aarch64-darwin";
 
-        specialArgs = { inherit emacs-larstvei; };
+          specialArgs = { inherit emacs-larstvei; };
 
-        modules = [
-          ./modules/core.nix
-          ./modules/macos.nix
-
-          nix-rosetta-builder.darwinModules.default
-          {
-            nix-rosetta-builder.onDemand = true;
-          }
-
-          home-manager.darwinModules.default
-          {
-            home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              extraSpecialArgs = { inherit emacs-larstvei; };
-              users.larstvei = {
-                imports = [
-                  ./modules/home.nix
-                ];
-              };
-            };
-          }
-        ];
+          modules = [
+            home-manager.darwinModules.default
+            ./hosts/macbook
+            nix-rosetta-builder.darwinModules.default
+            { nix-rosetta-builder.onDemand = true; }
+          ];
+        };
       };
     };
 }
diff --git a/hosts/macbook/default.nix b/hosts/macbook/default.nix
new file mode 100644
index 0000000..178735b
--- /dev/null
+++ b/hosts/macbook/default.nix
@@ -0,0 +1,14 @@
+{ emacs-larstvei, ... }:
+{
+  imports = [
+    ../../modules/core.nix
+    ../../modules/macos.nix
+  ];
+
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = { inherit emacs-larstvei; };
+    users.larstvei.imports = [ ../../modules/home.nix ];
+  };
+}