diff --git a/.gitignore b/.gitignore
index 16666d4..c167e5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,6 @@ TODO.MD
 # Local debugging
 img
 *.raw
+*.qcow2
 mnt/
 tree/
diff --git a/flake.lock b/flake.lock
index 6eb1301..c5860c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,11 +3,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1730504689,
-        "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
+        "lastModified": 1736143030,
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "506278e768c2a08bec68eb62932193e341f55c90",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -59,11 +59,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731139594,
-        "narHash": "sha256-IigrKK3vYRpUu+HEjPL/phrfh7Ox881er1UEsZvw9Q4=",
+        "lastModified": 1736798957,
+        "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76612b17c0ce71689921ca12d9ffdc9c23ce40b2",
+        "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3",
         "type": "github"
       },
       "original": {
@@ -73,22 +73,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable": {
-      "locked": {
-        "lastModified": 1730741070,
-        "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-24.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -97,15 +81,14 @@
         "gitignore": "gitignore",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "nixpkgs-stable": "nixpkgs-stable"
+        ]
       },
       "locked": {
-        "lastModified": 1731363552,
-        "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=",
+        "lastModified": 1735882644,
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 2941af5..e894167 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,8 +27,8 @@
       systems = import inputs.systems;
       imports = [ inputs.pre-commit-hooks-nix.flakeModule ];
       flake.nixosModules = {
-        naext = import ./nix/module.nix;
         dm-verity = import ./nix/dm-verity.nix;
+        naext = import ./nix/module.nix;
       };
       perSystem =
         {
diff --git a/nix/module.nix b/nix/module.nix
index 51daff5..49afd87 100644
--- a/nix/module.nix
+++ b/nix/module.nix
@@ -5,6 +5,9 @@
   ...
 }:
 let
+  nixosRelease = config.system.nixos.release;
+  inherit (config.system.nixos) distroId;
+
   mkExt = pkgs.callPackage ./lib/mkExt.nix { };
 
   extensionReleasePath = {
@@ -47,29 +50,14 @@ let
     else
       throw "[naext] The string '${str}' must start with ${lib.concatStringsSep " or " prefixes}";
 
-  # Helper function to format extension release metadata.
-  createExtensionReleaseFile =
-    type: name:
-    # bash
-    ''
-      mkdir -p $out${getExtensionReleasePathBy type}
-
-      cat >$out${getExtensionReleasePathBy type}/extension-release.${name} <<EOF
-      ID=nixos
-      VERSION_ID="24.11"
-      CONFEXT_SCOPE=system initrd
-      EOF
-    '';
-
   # Create the tree for an extension image
   mkExtTree =
-    type: files: name:
+    type: files:
     pkgs.runCommand "tree" { }
       # bash
       ''
         set -euo pipefail
 
-        ${createExtensionReleaseFile type name}
 
         mkFile() {
           src="$1"
@@ -176,14 +164,9 @@ in
                 description = "Contents of the Extension Release file.";
                 type = lib.types.lines;
                 default = ''
-                  ID=nixos
-                  VERSION_ID="24.11"
-                  CONFEXT_SCOPE=system initrd
-                '';
-                example = lib.literalExpression ''
-                  ID=nixos
-                  VERSION_ID="24.11"
-                  CONFEXT_SCOPE=system initrd
+                  ID=${distroId}
+                  VERSION_ID="${nixosRelease}"
+                  CONFEXT_SCOPE=system
                 '';
               };
               files = lib.mkOption {
@@ -219,13 +202,13 @@ in
                   # Add the extension-release to the files.
                   mergedFiles = self.files // {
                     "${getExtensionReleasePathBy self.extensionType}extension-release.${name}" = {
-                      source = self.extension-release;
+                      source = pkgs.writeText "extension-release" self.extension-release;
                       target = "${getExtensionReleasePathBy self.extensionType}extension-release.${name}";
 
                     };
                   };
                   # The tree to create the extension image from.
-                  tree = mkExtTree self.extensionType mergedFiles self.name;
+                  tree = mkExtTree self.extensionType mergedFiles;
                   # Determin the function to use for creating the extension image.
                   mkExtMethod =
                     if self.imageFormat == "verity" then
diff --git a/nix/tests/appliance.nix b/nix/tests/appliance.nix
index 7108f90..bb8fea7 100644
--- a/nix/tests/appliance.nix
+++ b/nix/tests/appliance.nix
@@ -37,8 +37,10 @@ in
             "esp" = {
               contents = {
                 # Necessary for the image to boot
-                "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
-                "/EFI/Linux/${config.system.boot.loader.ukiFile}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
+                "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source =
+                  "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
+                "/EFI/Linux/${config.system.boot.loader.ukiFile}".source =
+                  "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
               };
               repartConfig = {
                 Type = "esp";
diff --git a/nix/tests/basic.nix b/nix/tests/basic.nix
index d923a43..8cb56d2 100644
--- a/nix/tests/basic.nix
+++ b/nix/tests/basic.nix
@@ -6,7 +6,7 @@
   ...
 }:
 {
-  name = "confext-basic";
+  name = "basic";
   nodes = {
     machine = _: {
       naext = {