diff --git a/flake.nix b/flake.nix
index 5bf46f583..9be11c905 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,7 +24,7 @@
           overlays = [ self.overlays.default ];
         };
         inherit (pkgs) lib;
-        overlayAttrs = builtins.attrNames (self.overlays.emacs pkgs pkgs);
+        overlayAttrs = builtins.attrNames (import ./. pkgs pkgs);
 
       in
       {
diff --git a/overlays/default.nix b/overlays/default.nix
index 089b5494d..481957351 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -1,10 +1,9 @@
 self: super:
 let
-  inherit (super.lib) foldl' flip extends;
   overlays = [
     # package overlay must be applied before emacs overlay
     (import ./package.nix)
     (import ./emacs.nix)
   ];
 in
-foldl' (flip extends) (_: super) overlays self
+super.lib.composeManyExtensions overlays self super