diff --git a/packages/default.nix b/packages/default.nix
index 55313ec..be7a47e 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -9,21 +9,26 @@ let
   # Reference to the versions directory at the repo root
   versionsDir = ../versions;
   
-  # Common arguments passed to all package modules
-  commonArgs = {
-    inherit final prev fetchfromGitHubJSONFile versionsDir;
+  # Common arguments passed to package modules that don't need 'final'
+  baseArgs = {
+    inherit prev fetchfromGitHubJSONFile versionsDir;
+  };
+  
+  # Arguments for packages that need access to 'final' (for cross-package dependencies)
+  argsWithFinal = baseArgs // {
+    inherit final;
   };
 in {
   ## F
-  fwildclusterboot = import ./f/fwildclusterboot.nix commonArgs;
+  fwildclusterboot = import ./f/fwildclusterboot.nix argsWithFinal;
   
   ## H
-  httpgd = import ./h/httpgd.nix commonArgs;
+  httpgd = import ./h/httpgd.nix baseArgs;
   
   ## M
-  musicMetadata = import ./m/musicMetadata.nix commonArgs;
+  musicMetadata = import ./m/musicMetadata.nix baseArgs;
   
   ## S
-  summclust = import ./s/summclust.nix commonArgs;
-  synthdid = import ./s/synthdid.nix commonArgs;
+  summclust = import ./s/summclust.nix baseArgs;
+  synthdid = import ./s/synthdid.nix baseArgs;
 }
diff --git a/packages/h/httpgd.nix b/packages/h/httpgd.nix
index a770049..75e9f6f 100644
--- a/packages/h/httpgd.nix
+++ b/packages/h/httpgd.nix
@@ -1,5 +1,4 @@
 {
-  final,
   prev,
   fetchfromGitHubJSONFile,
   versionsDir,
diff --git a/packages/m/musicMetadata.nix b/packages/m/musicMetadata.nix
index 77d527c..8dcf4ff 100644
--- a/packages/m/musicMetadata.nix
+++ b/packages/m/musicMetadata.nix
@@ -1,5 +1,4 @@
 {
-  final,
   prev,
   fetchfromGitHubJSONFile,
   versionsDir,
diff --git a/packages/s/summclust.nix b/packages/s/summclust.nix
index c6367de..49fff68 100644
--- a/packages/s/summclust.nix
+++ b/packages/s/summclust.nix
@@ -1,5 +1,4 @@
 {
-  final,
   prev,
   fetchfromGitHubJSONFile,
   versionsDir,
diff --git a/packages/s/synthdid.nix b/packages/s/synthdid.nix
index 103f7e5..ed5a819 100644
--- a/packages/s/synthdid.nix
+++ b/packages/s/synthdid.nix
@@ -1,5 +1,4 @@
 {
-  final,
   prev,
   fetchfromGitHubJSONFile,
   versionsDir,