diff --git a/flake.lock b/flake.lock
index 585966f..4f6372a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -110,16 +110,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1770736414,
-        "narHash": "sha256-x5xdJgUxNflO9j2sJHIHnPujDy6eAWJPCMQml5y9XB4=",
+        "lastModified": 1767634391,
+        "narHash": "sha256-owcSz2ICqTSvhBbhPP+1eWzi88e54rRZtfCNE5E/wwg=",
         "owner": "nix-darwin",
         "repo": "nix-darwin",
-        "rev": "7c952d9a524ffbbd5b5edca38fe6d943499585cc",
+        "rev": "08585aacc3d6d6c280a02da195fdbd4b9cf083c2",
         "type": "github"
       },
       "original": {
         "owner": "nix-darwin",
-        "ref": "master",
+        "ref": "nix-darwin-25.11",
         "repo": "nix-darwin",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 10ae7bf..c594e22 100755
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
 
     # Nix Darwin
-    nix-darwin.url = "github:nix-darwin/nix-darwin/master";
+    nix-darwin.url = "github:nix-darwin/nix-darwin/nix-darwin-25.11";
     nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
 
     # Home manager
@@ -68,9 +68,8 @@
               ++ [
                 (import-tree ./hosts/common)
                 home-manager.nixosModules.home-manager
-                (import /hosts/nixos/overlays.nix { inherit nixpkgs nixpkgs-unstable; })
+                (import ./hosts/nixos/overlays.nix { inherit nixpkgs nixpkgs-unstable; })
 
-                (import-tree ./modules/home/common)
                 (import-tree ./modules/home/nixos)
                 (import-tree ./hosts/darwin/home)
               ];
@@ -96,9 +95,8 @@
               ++ [
                 (import-tree ./hosts/common)
                 home-manager.darwinModules.home-manager
-                (import /hosts/nixos/overlays.nix { inherit nixpkgs nixpkgs-unstable; })
+                (import ./hosts/nixos/overlays.nix { inherit nixpkgs nixpkgs-unstable; })
 
-                (import-tree ./modules/home/common)
                 (import-tree ./modules/home/darwin)
                 (import-tree ./hosts/darwin/home)
               ];
diff --git a/hosts/darwin/home/alistreaza.nix b/hosts/darwin/home/alistreaza.nix
index 0697619..7c88bb0 100644
--- a/hosts/darwin/home/alistreaza.nix
+++ b/hosts/darwin/home/alistreaza.nix
@@ -1,16 +1,16 @@
-{ ... }:
+{ import-tree, ... }:
 {
   home-manager.users.alistreaza = {
 
+    imports = [
+      (import-tree ../../common)
+    ];
+
     home = {
       username = "alistreaza";
       homeDirectory = /Users/alistreaza;
     };
 
-    # No Home Application Folders
-    targets.darwin.linkApps.enable = false;
-    targets.darwin.copyApps.enable = false;
-
     # Apps
     home.shell.zsh = true;
     home.shell.git = true;
@@ -27,6 +27,10 @@
 
     home.homebrew.keka = true;
 
+    # No Home Application Folders
+    targets.darwin.linkApps.enable = false;
+    targets.darwin.copyApps.enable = false;
+
     # The state version is required and should stay at the version you
     # originally installed.
     home.stateVersion = "25.11";
diff --git a/hosts/darwin/system/os.nix b/hosts/darwin/system/os.nix
index fe96b63..bb0b19f 100644
--- a/hosts/darwin/system/os.nix
+++ b/hosts/darwin/system/os.nix
@@ -1,9 +1,4 @@
-{ import-tree, ... }:
+{ ... }:
 {
-  imports = [
-    ./partials/users.nix
-    (import-tree ./apps)
-  ];
-
   nixpkgs.hostPlatform = "aarch64-darwin";
 }
diff --git a/hosts/nixos/home/users/alistreaza.nix b/hosts/nixos/home/alistreaza.nix
similarity index 83%
rename from hosts/nixos/home/users/alistreaza.nix
rename to hosts/nixos/home/alistreaza.nix
index 0f1059b..f3d7cf5 100644
--- a/hosts/nixos/home/users/alistreaza.nix
+++ b/hosts/nixos/home/alistreaza.nix
@@ -3,8 +3,7 @@
   home-manager.users.alistreaza = {
 
     imports = [
-      (import-tree ./options)
-      (import-tree ./partials)
+      (import-tree ../../common)
     ];
 
     home = {
@@ -12,6 +11,7 @@
       homeDirectory = "/home/alistreaza";
     };
 
+    # Apps
     home.shell.zsh = true;
     home.shell.git = true;
 
@@ -31,6 +31,8 @@
     # Markdown Editor
     home.editor.obsidian.enable = false;
 
+    # The state version is required and should stay at the version you
+    # originally installed.
     home.stateVersion = "25.11";
   };
 }