diff --git a/flake.nix b/flake.nix
index c3bdef73..dc4c1494 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,7 +44,7 @@
     nixosConfigurations = {
       mastodon = nixpkgs.lib.nixosSystem {
         inherit system;
-        modules = with self.nixosModules; [ 
+        modules = with self.nixosModules; [
           disko.nixosModules.default
           disk-layout
           bleedingFediverse
@@ -97,11 +97,9 @@
       };
     };
 
-    installers =
-      let
-        installer = (import ./installer.nix) nixpkgs;
-      in
-      lib.mapAttrs (_: config: installer config) self.nixosConfigurations;
+    ## Fully-feature ISO installer
+    mkInstaller = import ./installer.nix;
+    installers = lib.mapAttrs (_: config: self.mkInstaller nixpkgs config) self.nixosConfigurations;
 
     deploy =
       let