diff --git a/infra/libkookie/overlays/kookie/emacs/builder.nix b/infra/libkookie/overlays/kookie/emacs/builder.nix
index 77b76e4afbe..07f45eec9cb 100644
--- a/infra/libkookie/overlays/kookie/emacs/builder.nix
+++ b/infra/libkookie/overlays/kookie/emacs/builder.nix
@@ -49,6 +49,13 @@ rec {
       mkModPaths = modules: builtins.foldl' (acc: mod: acc ++ (unfold mod)) [] modules;
       # Build the list of module names
       mkModList = modules: map (m: m.name) modules;
+      # Extract emacs package dependencies
+      getUserEnvPkgs = with lib;
+        modules:
+        filter (f: f != null) (flatten
+          (concatMap
+            (mod: map (pkg: pkg.buildInputs ++ pkg.propagatedBuildInputs) mod.pkgs)
+            modules));
 
       ### Function invocations
       modList = mkModList modules;
@@ -64,7 +71,8 @@ rec {
         mkdir -p $out/share/emacs/site-lisp/
         cp ${loader} $out/share/emacs/site-lisp/default.el
       '';
-      paths = modPaths ++ [ loaderWrap ];
+      pkgDependencies = getUserEnvPkgs modules;
+      paths = modPaths ++ pkgDependencies ++ [ loaderWrap ];
     in
       with pkgs;
       symlinkJoin {
diff --git a/infra/libkookie/overlays/kookie/emacs/kookie-notmuch/default.nix b/infra/libkookie/overlays/kookie/emacs/kookie-notmuch/default.nix
index 6663bad5cdf..67ad383ff46 100644
--- a/infra/libkookie/overlays/kookie/emacs/kookie-notmuch/default.nix
+++ b/infra/libkookie/overlays/kookie/emacs/kookie-notmuch/default.nix
@@ -1,16 +1,4 @@
 { buildModule, epkgs, pkgs }:
 
 with epkgs;
-(buildModule "kookie-notmuch" ./. [ magit notmuch
-
-                                    ## FIXME: installing "f" directly
-                                    ## here is required because it is
-                                    ## a dependency of many other
-                                    ## tools, and installing magit
-                                    ## seems to remove it from the
-                                    ## emacs closure.
-                                    ##
-                                    ## Why? I don't know.  Maybe one
-                                    ## day we will understand.
-                                    f
-                                  ])
+(buildModule "kookie-notmuch" ./. [ magit notmuch ])
diff --git a/infra/libkookie/overlays/kookie/emacs/theme/default.el b/infra/libkookie/overlays/kookie/emacs/theme/default.el
index e1a3d539b57..0083dc8373b 100644
--- a/infra/libkookie/overlays/kookie/emacs/theme/default.el
+++ b/infra/libkookie/overlays/kookie/emacs/theme/default.el
@@ -1,4 +1,3 @@
-
 (provide 'theme)
 
 (load-theme 'sanityinc-tomorrow-eighties t)