diff --git a/nix/home.nix b/nix/home.nix
index 6bbe709..b1397cd 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -12,30 +12,22 @@
   # Enable integration with generic Linux OSs
   targets.genericLinux.enable = pkgs.stdenv.isLinux;
 
-  home.packages = with pkgs; let
-    isOnMac = stdenv.hostPlatform.isDarwin;
-    basePackages = [
-      # Better cat
-      bat
-      # Better find
-      fd
-      # Better df
-      duf
-      # Better top
-      htop
-      ncdu
-      ripgrep
-      tmux
-      fira-code
-      fira-code-nerdfont
-      roboto-mono
-    ];
-    macPackages = basePackages ++ [
-      # Emacs on Mac wants prefixed versions of GNU coreutils
-      coreutils-prefixed
-    ];
-  in
-    if isOnMac then macPackages else basePackages;
+  home.packages = with pkgs; [
+    # Better cat
+    bat
+    # Better find
+    fd
+    # Better df
+    duf
+    # Better top
+    htop
+    ncdu
+    ripgrep
+    tmux
+    fira-code
+    fira-code-nerdfont
+    roboto-mono
+  ];
 
   imports = [
     ./modules/fish
diff --git a/nix/modules/emacs.nix b/nix/modules/emacs.nix
index a712d53..613f133 100644
--- a/nix/modules/emacs.nix
+++ b/nix/modules/emacs.nix
@@ -1,16 +1,18 @@
 { config, lib, pkgs, ... }:
 with config.lib.file;
 let dotdir = "${config.home.homeDirectory}/.dotfiles";
+    isOnMac = pkgs.stdenv.hostPlatform.isDarwin;
 in
 {
   programs.emacs.enable = true;
   programs.emacs.package = pkgs.emacs;
   programs.emacs.extraPackages = epkgs: [ epkgs.vterm ];
 
-  home.packages = with pkgs; [
-    # Required by nativeComp but not a dependency for some reason
-    zstd
-  ];
+  home.packages = with pkgs; let
+    basePackages = [ zstd ];
+    macPackages = basePackages ++ [ coreutils ];
+  in
+    if isOnMac then macPackages else basePackages;
 
   xdg.configFile = {
     "emacs".source = mkOutOfStoreSymlink "${dotdir}/thoom-emacs";
diff --git a/thoom-emacs/modules/thoom-os.el b/thoom-emacs/modules/thoom-os.el
index 9e41965..c4a047c 100644
--- a/thoom-emacs/modules/thoom-os.el
+++ b/thoom-emacs/modules/thoom-os.el
@@ -18,6 +18,3 @@
   (exec-path-from-shell-initialize))
 
 (elpaca-wait)
-
-(when ON-MAC
-  (setq insert-directory-program "gls"))