diff --git a/outputs.nix b/outputs.nix
index 4146c0f..b26e229 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -60,7 +60,7 @@ self = {
       ( lib.filterAttrs (name: type:
         (
           (type == "regular" && lib.hasSuffix ".nix" name)
-          || (type == "directory" && builtins.pathExists "${builtins.toString ./.}/hosts/${name}/default.nix")
+          || (type == "directory" && builtins.pathExists "${./.}/hosts/${name}/default.nix")
         )
         && !lib.hasPrefix "." name
       ))
@@ -73,7 +73,6 @@ self = {
       builtins.attrValues
       builtins.listToAttrs
     ];
-  updateList = import ./update-list.nix self;
   # FIXME: currently impure
   # NOTE: to run, you need to evaluate outputs.nix instead of default.nix
   #       nix-shell outputs.nix -A update
@@ -81,7 +80,9 @@ self = {
     updateScript = (self.packagesForSystem (builtins.currentSystem)).den-update-script;
   in updateScript {
     path = "";
-    packages = lib.pipe self.updateList [
+    packages = lib.pipe ./update-list.nix [
+      import
+      (x: x self)
       lib.attrsToList
       (lib.imap1 (i: {name, value}: {
         name = builtins.toString i;