diff --git a/modules/programs/emacs.nix b/modules/programs/emacs.nix
index bd68f68ab..2c006bba5 100644
--- a/modules/programs/emacs.nix
+++ b/modules/programs/emacs.nix
@@ -6,11 +6,7 @@ let
 
   cfg = config.programs.emacs;
 
-  # Copied from all-packages.nix, with modifications to support
-  # overrides.
-  emacsPackages = let epkgs = pkgs.emacsPackagesFor cfg.package;
-  in epkgs.overrideScope' cfg.overrides;
-
+  emacsPackages = cfg.package.pkgs.overrideScope' cfg.overrides;
   emacsWithPackages = emacsPackages.emacsWithPackages;
 
   createConfPackage = epkgs:
diff --git a/tests/modules/services/emacs/emacs-service-27.nix b/tests/modules/services/emacs/emacs-service-27.nix
index fa5f9f62b..7ddf8fc20 100644
--- a/tests/modules/services/emacs/emacs-service-27.nix
+++ b/tests/modules/services/emacs/emacs-service-27.nix
@@ -8,9 +8,9 @@ with lib;
       (self: super: rec {
         emacs = pkgs.writeShellScriptBin "dummy-emacs-27.2" "" // {
           outPath = "@emacs@";
+          pkgs =
+            makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
         };
-        emacsPackagesFor = _:
-          makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
       })
     ];
 
diff --git a/tests/modules/services/emacs/emacs-service-28.nix b/tests/modules/services/emacs/emacs-service-28.nix
index 092cd1453..3effc2aea 100644
--- a/tests/modules/services/emacs/emacs-service-28.nix
+++ b/tests/modules/services/emacs/emacs-service-28.nix
@@ -8,9 +8,9 @@ with lib;
       (self: super: rec {
         emacs = pkgs.writeShellScriptBin "dummy-emacs-28.0.5" "" // {
           outPath = "@emacs@";
+          pkgs =
+            makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
         };
-        emacsPackagesFor = _:
-          makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
       })
     ];
 
diff --git a/tests/modules/services/emacs/emacs-socket-27.nix b/tests/modules/services/emacs/emacs-socket-27.nix
index 0fd1be1be..5757f8c52 100644
--- a/tests/modules/services/emacs/emacs-socket-27.nix
+++ b/tests/modules/services/emacs/emacs-socket-27.nix
@@ -10,9 +10,9 @@ in {
       (self: super: rec {
         emacs = pkgs.writeShellScriptBin "dummy-emacs-27.2" "" // {
           outPath = "@emacs@";
+          pkgs =
+            makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
         };
-        emacsPackagesFor = _:
-          makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
       })
     ];
 
diff --git a/tests/modules/services/emacs/emacs-socket-28.nix b/tests/modules/services/emacs/emacs-socket-28.nix
index d2c04239c..c4e7fb092 100644
--- a/tests/modules/services/emacs/emacs-socket-28.nix
+++ b/tests/modules/services/emacs/emacs-socket-28.nix
@@ -10,9 +10,9 @@ in {
       (self: super: rec {
         emacs = pkgs.writeShellScriptBin "dummy-emacs-28.0.5" "" // {
           outPath = "@emacs@";
+          pkgs =
+            makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
         };
-        emacsPackagesFor = _:
-          makeScope super.newScope (_: { emacsWithPackages = _: emacs; });
       })
     ];