diff --git a/overlay/image-builder/default.nix b/overlay/image-builder/default.nix
index 2a94826f..de38941d 100644
--- a/overlay/image-builder/default.nix
+++ b/overlay/image-builder/default.nix
@@ -14,7 +14,7 @@
       _module.args.pkgs = pkgs;
     });
     filesystem-image = lib.types.submodule ({
-      imports = import (./filesystem-image/module-list.nix);
+      imports = [ ./filesystem-image ];
       _module.args.pkgs = pkgs;
     });
   };
diff --git a/overlay/image-builder/filesystem-image/default.nix b/overlay/image-builder/filesystem-image/default.nix
new file mode 100644
index 00000000..68b598a6
--- /dev/null
+++ b/overlay/image-builder/filesystem-image/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ../helpers.nix
+    ./basic.nix
+    ./filesystem
+  ];
+}
diff --git a/overlay/image-builder/filesystem-image/eval-config.nix b/overlay/image-builder/filesystem-image/eval-config.nix
index 90e6cad2..d3e58de1 100644
--- a/overlay/image-builder/filesystem-image/eval-config.nix
+++ b/overlay/image-builder/filesystem-image/eval-config.nix
@@ -7,7 +7,7 @@
 }:
 let config' = config; in
 rec {
-  module = { imports = import ./module-list.nix; };
+  module = { imports = [ ./. ]; };
   config = (pkgs.lib.evalModules {
     modules = [
       { _module.args.pkgs = pkgs; }
diff --git a/overlay/image-builder/filesystem-image/module-list.nix b/overlay/image-builder/filesystem-image/module-list.nix
deleted file mode 100644
index be0df334..00000000
--- a/overlay/image-builder/filesystem-image/module-list.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-[
-  ../helpers.nix
-  ./basic.nix
-  ./filesystem
-]