diff --git a/flake.lock b/flake.lock
index 180876d..88ace98 100644
--- a/flake.lock
+++ b/flake.lock
@@ -819,42 +819,6 @@
         "type": "github"
       }
     },
-    "nixlib": {
-      "locked": {
-        "lastModified": 1736643958,
-        "narHash": "sha256-tmpqTSWVRJVhpvfSN9KXBvKEXplrwKnSZNAoNPf/S/s=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "1418bc28a52126761c02dd3d89b2d8ca0f521181",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixos-generators": {
-      "inputs": {
-        "nixlib": "nixlib",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1769813415,
-        "narHash": "sha256-nnVmNNKBi1YiBNPhKclNYDORoHkuKipoz7EtVnXO50A=",
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "8946737ff703382fda7623b9fab071d037e897d5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1743576891,
@@ -1104,7 +1068,6 @@
         "jawz-scripts": "jawz-scripts",
         "lidarr-mb-gap": "lidarr-mb-gap",
         "nix-gaming": "nix-gaming",
-        "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-small": "nixpkgs-small",
         "nixpkgs-unstable": "nixpkgs-unstable",
diff --git a/flake.nix b/flake.nix
index 211f290..f3773d5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,10 +50,6 @@
       url = "github:nyawox/nixtendo-switch";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nixos-generators = {
-      url = "github:nix-community/nixos-generators";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     wallpapers = {
       url = "git+https://git.lebubu.org/jawz/wallpapers.git";
       flake = false;
diff --git a/parts/packages.nix b/parts/packages.nix
index 9a2eab4..3448711 100644
--- a/parts/packages.nix
+++ b/parts/packages.nix
@@ -29,15 +29,7 @@
     in
     {
       packages = (inputs.jawz-scripts.packages.${system} or { }) // {
-        emacs-vm = inputs.nixos-generators.nixosGenerate {
-          inherit system;
-          modules = inputs.self.lib.commonModules "emacs";
-          format = "vm";
-          specialArgs = {
-            inherit inputs;
-            outputs = inputs.self;
-          };
-        };
+        emacs-vm = inputs.self.nixosConfigurations.emacs.config.system.build.vm;
         nixos-mcp = nixosMcp;
         nixos-mcp-server = mcpServerPkg;
       };
diff --git a/specs/003-vps-image-migration/tasks.md b/specs/003-vps-image-migration/tasks.md
index ae67c89..34eddfa 100644
--- a/specs/003-vps-image-migration/tasks.md
+++ b/specs/003-vps-image-migration/tasks.md
@@ -22,8 +22,8 @@ description: "Task list for VPS Image Migration"
 
 **Purpose**: Project initialization and validation setup
 
-- [ ] T001 Review current image generation usage in `flake.nix` and `parts/packages.nix` and note all nixos-generators references
-- [ ] T002 [P] Review host structure in `hosts/` to mirror patterns for the new `hosts/vps/configuration.nix`
+- [X] T001 Review current image generation usage in `flake.nix` and `parts/packages.nix` and note all nixos-generators references
+- [X] T002 [P] Review host structure in `hosts/` to mirror patterns for the new `hosts/vps/configuration.nix`
 
 ---
 
@@ -31,9 +31,9 @@ description: "Task list for VPS Image Migration"
 
 **Purpose**: Remove deprecated generator and ensure existing outputs are preserved
 
-- [ ] T003 Update `parts/packages.nix` to build `emacs-vm` from nixpkgs/NixOS outputs (remove nixos-generators usage)
-- [ ] T004 Remove nixos-generators input from `flake.nix`
-- [ ] T005 Update `flake.lock` to drop nixos-generators entries
+- [X] T003 Update `parts/packages.nix` to build `emacs-vm` from nixpkgs/NixOS outputs (remove nixos-generators usage)
+- [X] T004 Remove nixos-generators input from `flake.nix`
+- [X] T005 Update `flake.lock` to drop nixos-generators entries
 - [ ] T006 STOP: Ask user to validate `emacs-vm` build works without nixos-generators (confirm before proceeding) (reference `parts/packages.nix`)
 
 **Checkpoint**: Foundation ready after user confirmation