diff --git a/config/base.nix b/config/base.nix
index eaa47b1..bfc8e92 100644
--- a/config/base.nix
+++ b/config/base.nix
@@ -1,6 +1,11 @@
 { config, pkgs ? import <nixpkgs>, lib, ... }:
-
-{
+let
+  installFiles = pkgs.runCommand "installFiles" {} ''
+    mkdir -p $out
+    cp -rv ${./initrd-include}/* $out/
+    chmod +x -R $out/bin/
+  '';
+in {
   options.customPkgs.installFiles = lib.mkOption {
     type = lib.types.package;
   };
@@ -9,16 +14,14 @@
   };
  config = {
   imports = [ 
-    ../quickly.nix
-    ## installer.nix is a system service to run a script on boot
-    ../installer/installer.nix
+    (import ../quickly.nix )
+    (import ../installer/installer.nix { inherit installFiles; })
     ];
-     ##uncomment to pass installFiles to modules
-  customPkgs.installFiles = pkgs.runCommand "installFiles" {} ''
-    mkdir -p $out
-    cp -rv ${./initrd-include}/* $out/
-    chmod +x -R $out/bin/
-  '';
+  #customPkgs.installFiles = pkgs.runCommand "installFiles" {} ''
+  #  mkdir -p $out
+  #  cp -rv ${./initrd-include}/* $out/
+  #  chmod +x -R $out/bin/
+  #'';
 
   services.getty.autologinUser = "nixos";
   security.sudo.wheelNeedsPassword = false;
diff --git a/installer/installer.nix b/installer/installer.nix
index ae927f3..09b6b67 100644
--- a/installer/installer.nix
+++ b/installer/installer.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, lib, customPkgs, ... }:
+{ pkgs, config, lib, installFiles, ... }:
 {
   config = {
   systemd.services.custom-install = {
@@ -17,7 +17,7 @@
     
     script = ''
     mkdir /home/nixos/installer
-    cp -R ${customPkgs.installFiles}/ /home/nixos/installer
+    cp -R ${installFiles}/ /home/nixos/installer
     ln -s /home/nixos/installer/bin/installer.sh /home/nixos/installer.sh
     echo "Installer files are available in /home/nixos/installer"
     echo "The installer.sh script is available in directly in /home/nixos/installer.sh"