diff --git a/aspects/hosts/alexandria.nix b/aspects/hosts/alexandria.nix
index 83304b1..b63c370 100644
--- a/aspects/hosts/alexandria.nix
+++ b/aspects/hosts/alexandria.nix
@@ -1,50 +1,60 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
-  flake.nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem {
-    system = "x86_64-linux";
-    specialArgs = { inherit inputs; };
-    modules = [
-      inputs.agenix.nixosModules.default
-      { networking.hostName = "alexandria"; }
-      {
-        nixpkgs.overlays = [
-          inputs.agenix.overlays.default
-          inputs.self.overlays.default
-        ];
-      }
+  flake = {
+    nixosConfigurations.alexandria = inputs.nixpkgs-stable.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
+      modules = [
+        inputs.agenix.nixosModules.default
+        { networking.hostName = "alexandria"; }
+        {
+          nixpkgs.overlays = [
+            inputs.agenix.overlays.default
+            inputs.self.overlays.default
+          ];
+        }
 
-      # Common aspects (always included)
-      inputs.self.modules.nixos.common-boot
-      inputs.self.modules.nixos.common-console
-      inputs.self.modules.nixos.common-firewall
-      inputs.self.modules.nixos.common-locale
-      inputs.self.modules.nixos.common-nix
-      inputs.self.modules.nixos.common-openssh
-      inputs.self.modules.nixos.common-programs
-      inputs.self.modules.nixos.common-security
-      inputs.self.modules.nixos.common-services
-      inputs.self.modules.nixos.common-tailscale
+        # Common aspects (always included)
+        inputs.self.modules.nixos.common-boot
+        inputs.self.modules.nixos.common-console
+        inputs.self.modules.nixos.common-firewall
+        inputs.self.modules.nixos.common-locale
+        inputs.self.modules.nixos.common-nix
+        inputs.self.modules.nixos.common-openssh
+        inputs.self.modules.nixos.common-programs
+        inputs.self.modules.nixos.common-security
+        inputs.self.modules.nixos.common-services
+        inputs.self.modules.nixos.common-tailscale
 
-      # User aspects
-      inputs.self.modules.nixos.user
-      inputs.self.modules.nixos.root
+        # User aspects
+        inputs.self.modules.nixos.user
+        inputs.self.modules.nixos.root
 
-      # Server aspects
-      inputs.self.modules.nixos.server-boot
-      inputs.self.modules.nixos.server-nix
-      inputs.self.modules.nixos.server-tailscale
+        # Server aspects
+        inputs.self.modules.nixos.server-boot
+        inputs.self.modules.nixos.server-nix
+        inputs.self.modules.nixos.server-tailscale
 
-      # Other aspects based on tags
-      inputs.self.modules.nixos.fwupd
+        # Other aspects based on tags
+        inputs.self.modules.nixos.fwupd
 
-      # Host-specific files (from _alexandria/)
-      ./_alexandria/hardware-configuration.nix
-      ./_alexandria/jellyfin.nix
-      ./_alexandria/kanidm.nix
-      ./_alexandria/nextcloud.nix
-      ./_alexandria/nginx.nix
-      ./_alexandria/unbound.nix
-      ./_alexandria/vaultwarden.nix
-    ];
+        # Host-specific files (from _alexandria/)
+        ./_alexandria/hardware-configuration.nix
+        ./_alexandria/jellyfin.nix
+        ./_alexandria/kanidm.nix
+        ./_alexandria/nextcloud.nix
+        ./_alexandria/nginx.nix
+        ./_alexandria/unbound.nix
+        ./_alexandria/vaultwarden.nix
+      ];
+    };
+    deploy.nodes.alexandria = {
+      hostname = "alexandria";
+      profiles.system = {
+        sshUser = "user";
+        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.alexandria;
+        user = "root";
+      };
+    };
   };
 }
diff --git a/aspects/hosts/io.nix b/aspects/hosts/io.nix
index 6e5b237..2b5f72f 100644
--- a/aspects/hosts/io.nix
+++ b/aspects/hosts/io.nix
@@ -1,59 +1,70 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
-  flake.nixosConfigurations.io = inputs.nixpkgs.lib.nixosSystem {
-    system = "x86_64-linux";
-    specialArgs = { inherit inputs; };
-    modules = [
-      inputs.agenix.nixosModules.default
-      { networking.hostName = "io"; }
-      {
-        nixpkgs.overlays = [
-          inputs.agenix.overlays.default
-          inputs.self.overlays.default
-        ];
-      }
+  flake = {
+    nixosConfigurations.io = inputs.nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
+      modules = [
+        inputs.agenix.nixosModules.default
+        { networking.hostName = "io"; }
+        {
+          nixpkgs.overlays = [
+            inputs.agenix.overlays.default
+            inputs.self.overlays.default
+          ];
+        }
 
-      # Common aspects (always included)
-      inputs.self.modules.nixos.common-boot
-      inputs.self.modules.nixos.common-console
-      inputs.self.modules.nixos.common-firewall
-      inputs.self.modules.nixos.common-locale
-      inputs.self.modules.nixos.common-nix
-      inputs.self.modules.nixos.common-openssh
-      inputs.self.modules.nixos.common-programs
-      inputs.self.modules.nixos.common-security
-      inputs.self.modules.nixos.common-services
-      inputs.self.modules.nixos.common-tailscale
+        # Common aspects (always included)
+        inputs.self.modules.nixos.common-boot
+        inputs.self.modules.nixos.common-console
+        inputs.self.modules.nixos.common-firewall
+        inputs.self.modules.nixos.common-locale
+        inputs.self.modules.nixos.common-nix
+        inputs.self.modules.nixos.common-openssh
+        inputs.self.modules.nixos.common-programs
+        inputs.self.modules.nixos.common-security
+        inputs.self.modules.nixos.common-services
+        inputs.self.modules.nixos.common-tailscale
 
-      # User aspects
-      inputs.self.modules.nixos.user
-      inputs.self.modules.nixos.root
+        # User aspects
+        inputs.self.modules.nixos.user
+        inputs.self.modules.nixos.root
 
-      # Desktop aspects
-      inputs.self.modules.nixos.desktop-boot
-      inputs.self.modules.nixos.desktop-desktop
-      inputs.self.modules.nixos.desktop-nix
-      inputs.self.modules.nixos.desktop-services
+        # Desktop aspects
+        inputs.self.modules.nixos.desktop-boot
+        inputs.self.modules.nixos.desktop-desktop
+        inputs.self.modules.nixos.desktop-nix
+        inputs.self.modules.nixos.desktop-services
 
-      # Other aspects based on tags
-      inputs.self.modules.nixos.ai
-      inputs.self.modules.nixos.bluetooth
-      inputs.self.modules.nixos.dev
-      inputs.self.modules.nixos.libvirtd
-      inputs.self.modules.nixos.networkmanager
-      inputs.self.modules.nixos.podman
+        # Other aspects based on tags
+        inputs.self.modules.nixos.ai
+        inputs.self.modules.nixos.bluetooth
+        inputs.self.modules.nixos.dev
+        inputs.self.modules.nixos.libvirtd
+        inputs.self.modules.nixos.networkmanager
+        inputs.self.modules.nixos.podman
 
-      # Factory-generated ephemeral module
-      (inputs.self.factory.ephemeral {
-        rootDevice = "/dev/mapper/cryptroot";
-      })
+        # Factory-generated ephemeral module
+        (inputs.self.factory.ephemeral {
+          rootDevice = "/dev/mapper/cryptroot";
+        })
 
-      # Host-specific files (from _io/)
-      ./_io/hardware-configuration.nix
-      ./_io/disko.nix
-      ./_io/boot.nix
-      ./_io/programs.nix
-      ./_io/services.nix
-    ];
+        # Host-specific files (from _io/)
+        ./_io/hardware-configuration.nix
+        ./_io/disko.nix
+        ./_io/boot.nix
+        ./_io/programs.nix
+        ./_io/services.nix
+      ];
+    };
+    deploy.nodes.io = {
+      hostname = "io";
+      profiles.system = {
+        sshUser = "user";
+        path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.io;
+        user = "root";
+        remoteBuild = false;
+      };
+    };
   };
 }
diff --git a/aspects/hosts/trantor.nix b/aspects/hosts/trantor.nix
index c43c6f2..c806987 100644
--- a/aspects/hosts/trantor.nix
+++ b/aspects/hosts/trantor.nix
@@ -1,54 +1,64 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 {
-  flake.nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem {
-    system = "aarch64-linux";
-    specialArgs = { inherit inputs; };
-    modules = [
-      inputs.agenix.nixosModules.default
-      { networking.hostName = "trantor"; }
-      {
-        nixpkgs.overlays = [
-          inputs.agenix.overlays.default
-          inputs.self.overlays.default
-        ];
-      }
+  flake = {
+    nixosConfigurations.trantor = inputs.nixpkgs-stable.lib.nixosSystem {
+      system = "aarch64-linux";
+      specialArgs = { inherit inputs; };
+      modules = [
+        inputs.agenix.nixosModules.default
+        { networking.hostName = "trantor"; }
+        {
+          nixpkgs.overlays = [
+            inputs.agenix.overlays.default
+            inputs.self.overlays.default
+          ];
+        }
 
-      # Common aspects (always included)
-      inputs.self.modules.nixos.common-boot
-      inputs.self.modules.nixos.common-console
-      inputs.self.modules.nixos.common-firewall
-      inputs.self.modules.nixos.common-locale
-      inputs.self.modules.nixos.common-nix
-      inputs.self.modules.nixos.common-openssh
-      inputs.self.modules.nixos.common-programs
-      inputs.self.modules.nixos.common-security
-      inputs.self.modules.nixos.common-services
-      inputs.self.modules.nixos.common-tailscale
+        # Common aspects (always included)
+        inputs.self.modules.nixos.common-boot
+        inputs.self.modules.nixos.common-console
+        inputs.self.modules.nixos.common-firewall
+        inputs.self.modules.nixos.common-locale
+        inputs.self.modules.nixos.common-nix
+        inputs.self.modules.nixos.common-openssh
+        inputs.self.modules.nixos.common-programs
+        inputs.self.modules.nixos.common-security
+        inputs.self.modules.nixos.common-services
+        inputs.self.modules.nixos.common-tailscale
 
-      # User aspects
-      inputs.self.modules.nixos.user
-      inputs.self.modules.nixos.root
+        # User aspects
+        inputs.self.modules.nixos.user
+        inputs.self.modules.nixos.root
 
-      # Server aspects
-      inputs.self.modules.nixos.server-boot
-      inputs.self.modules.nixos.server-nix
-      inputs.self.modules.nixos.server-tailscale
+        # Server aspects
+        inputs.self.modules.nixos.server-boot
+        inputs.self.modules.nixos.server-nix
+        inputs.self.modules.nixos.server-tailscale
 
-      # Factory-generated ephemeral module
-      (inputs.self.factory.ephemeral {
-        rootDevice = "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20-part2";
-      })
+        # Factory-generated ephemeral module
+        (inputs.self.factory.ephemeral {
+          rootDevice = "/dev/disk/by-id/scsi-360b207ed25d84372a95d1ecf842f8e20-part2";
+        })
 
-      # Host-specific files (from _trantor/)
-      ./_trantor/hardware-configuration.nix
-      ./_trantor/disko.nix
-      ./_trantor/boot.nix
-      ./_trantor/fail2ban.nix
-      ./_trantor/forgejo.nix
-      ./_trantor/networking.nix
-      ./_trantor/nginx.nix
-      ./_trantor/openssh.nix
-      ./_trantor/unbound.nix
-    ];
+        # Host-specific files (from _trantor/)
+        ./_trantor/hardware-configuration.nix
+        ./_trantor/disko.nix
+        ./_trantor/boot.nix
+        ./_trantor/fail2ban.nix
+        ./_trantor/forgejo.nix
+        ./_trantor/networking.nix
+        ./_trantor/nginx.nix
+        ./_trantor/openssh.nix
+        ./_trantor/unbound.nix
+      ];
+    };
+    deploy.nodes.trantor = {
+      hostname = "trantor";
+      profiles.system = {
+        sshUser = "user";
+        path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.trantor;
+        user = "root";
+      };
+    };
   };
 }
diff --git a/aspects/stylix.nix b/aspects/stylix.nix
index e64386f..ec3fd42 100644
--- a/aspects/stylix.nix
+++ b/aspects/stylix.nix
@@ -1,71 +1,80 @@
 { ... }:
 {
   flake.modules = {
-    nixos.stylix = { inputs, ... }: {
-      imports = [ inputs.stylix.nixosModules.stylix ];
-    };
-
-    homeManager.stylix = { config, inputs, pkgs, ... }: {
-      imports = [
-        inputs.stylix.homeManagerModules.stylix
-        inputs.zen-browser.homeModules.beta
-      ];
-
-      stylix = {
-        enable = true;
-        polarity = "dark";
-        base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyodark.yaml";
-        cursor = {
-          package = pkgs.kdePackages.breeze;
-          name = "breeze_cursors";
-          size = 24;
-        };
-        icons = {
-          enable = true;
-          package = pkgs.morewaita-icon-theme;
-          light = "MoreWaita";
-          dark = "MoreWaita";
-        };
-        opacity = {
-          applications = 1.0;
-          desktop = 1.0;
-          popups = config.stylix.opacity.desktop;
-          terminal = 1.0;
-        };
-        fonts = {
-          serif = {
-            package = pkgs.source-serif;
-            name = "Source Serif 4 Display";
-          };
-          sansSerif = {
-            package = pkgs.inter;
-            name = "Inter";
-          };
-          monospace = {
-            package = pkgs.nerd-fonts.fira-code;
-            name = "FiraCode Nerd Font";
-          };
-          emoji = {
-            package = pkgs.noto-fonts-color-emoji;
-            name = "Noto Color Emoji";
-          };
-          sizes = {
-            applications = 10;
-            desktop = config.stylix.fonts.sizes.applications;
-            popups = config.stylix.fonts.sizes.applications;
-            terminal = 12;
-          };
-        };
-        targets.zen-browser = {
-          enable = true;
-          profileNames = [ "william" ];
-        };
+    nixos.stylix =
+      { inputs, ... }:
+      {
+        imports = [ inputs.stylix.nixosModules.stylix ];
       };
 
-      programs.zen-browser = {
-        enable = true;
-        profiles.william = { };
+    homeManager.stylix =
+      {
+        config,
+        inputs,
+        pkgs,
+        ...
+      }:
+      {
+        imports = [
+          inputs.stylix.homeModules.stylix
+          inputs.zen-browser.homeModules.beta
+        ];
+
+        stylix = {
+          enable = true;
+          polarity = "dark";
+          base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyodark.yaml";
+          cursor = {
+            package = pkgs.kdePackages.breeze;
+            name = "breeze_cursors";
+            size = 24;
+          };
+          icons = {
+            enable = true;
+            package = pkgs.morewaita-icon-theme;
+            light = "MoreWaita";
+            dark = "MoreWaita";
+          };
+          opacity = {
+            applications = 1.0;
+            desktop = 1.0;
+            popups = config.stylix.opacity.desktop;
+            terminal = 1.0;
+          };
+          fonts = {
+            serif = {
+              package = pkgs.source-serif;
+              name = "Source Serif 4 Display";
+            };
+            sansSerif = {
+              package = pkgs.inter;
+              name = "Inter";
+            };
+            monospace = {
+              package = pkgs.nerd-fonts.fira-code;
+              name = "FiraCode Nerd Font";
+            };
+            emoji = {
+              package = pkgs.noto-fonts-color-emoji;
+              name = "Noto Color Emoji";
+            };
+            sizes = {
+              applications = 10;
+              desktop = config.stylix.fonts.sizes.applications;
+              popups = config.stylix.fonts.sizes.applications;
+              terminal = 12;
+            };
+          };
+          targets.zen-browser = {
+            enable = true;
+            profileNames = [ "william" ];
+          };
+        };
+
+        programs.zen-browser = {
+          enable = true;
+          profiles.william = { };
+        };
       };
-    };
   };
 }
diff --git a/aspects/users/user.nix b/aspects/users/user.nix
index 050b1a5..4106ffb 100644
--- a/aspects/users/user.nix
+++ b/aspects/users/user.nix
@@ -1,4 +1,4 @@
-{ inputs, ... }:
+{ inputs, self, ... }:
 
 {
   flake = {
@@ -114,5 +114,11 @@
         ];
       };
     };
+    deploy.nodes.io.profiles.user = {
+      sshUser = "user";
+      path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations."user@io";
+      user = "user";
+      remoteBuild = false;
+    };
   };
 }
diff --git a/deploy.nix b/deploy.nix
deleted file mode 100644
index 187c92f..0000000
--- a/deploy.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ inputs, self, ... }:
-{
-  flake.deploy = {
-    remoteBuild = true;
-    nodes = {
-      alexandria = {
-        hostname = "alexandria";
-        profiles.system = {
-          sshUser = "user";
-          path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.alexandria;
-          user = "root";
-        };
-      };
-
-      trantor = {
-        hostname = "trantor";
-        profiles.system = {
-          sshUser = "user";
-          path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos self.nixosConfigurations.trantor;
-          user = "root";
-        };
-      };
-
-      io = {
-        hostname = "io";
-        profiles = {
-          system = {
-            sshUser = "user";
-            path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos self.nixosConfigurations.io;
-            user = "root";
-            remoteBuild = false;
-          };
-          user = {
-            sshUser = "user";
-            path = inputs.deploy-rs.lib.x86_64-linux.activate.home-manager self.homeConfigurations."user@io";
-            user = "user";
-            remoteBuild = false;
-          };
-        };
-      };
-    };
-  };
-  perSystem =
-    { system, ... }:
-    {
-      checks = inputs.deploy-rs.lib.${system}.deployChecks self.deploy;
-    };
-}
diff --git a/flake.nix b/flake.nix
index 482ebea..35735d0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,10 +53,10 @@
   outputs =
     inputs@{ flake-parts, import-tree, ... }:
     let
-      aspectsModule = import-tree ./aspects;
-      packagesModule = import-tree ./packages;
-      shellsModule = import-tree ./shells;
-      terranixModule = import-tree ./terranix;
+      aspectsModules = import-tree ./aspects;
+      packagesModules = import-tree ./packages;
+      shellsModules = import-tree ./shells;
+      terranixModules = import-tree ./terranix;
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = [
@@ -68,12 +68,9 @@
         flake-parts.flakeModules.modules
         inputs.terranix.flakeModule
       ]
-      ++ aspectsModule.imports
-      ++ packagesModule.imports
-      ++ shellsModule.imports
-      ++ terranixModule.imports
-      ++ [
-        ./deploy.nix
-      ];
+      ++ aspectsModules.imports
+      ++ packagesModules.imports
+      ++ shellsModules.imports
+      ++ terranixModules.imports;
     };
 }