diff --git a/configuration.nix b/configuration.nix
index e8aea42..b9eedb4 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -103,8 +103,6 @@
     ./modules/printing.nix
     ./modules/periodic.nix
     ./modules/power.nix
-    ./modules/cachix.nix
-    ./overlays/emacs-overlay.nix
   ];
 
 }
diff --git a/modules/software.nix b/modules/software.nix
index d030d3e..ff5d9b9 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -20,7 +20,7 @@
     haskellPackages.pandoc-citeproc
     # Text editors
     neovim
-    emacsGcc
+    emacs
     ripgrep
     fd
     clang
diff --git a/overlays/emacs-overlay.nix b/overlays/emacs-overlay.nix
deleted file mode 100644
index cb2a8cf..0000000
--- a/overlays/emacs-overlay.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  nixpkgs.overlays = [
-    (import (builtins.fetchTarball {
-      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-    }))
-  ];
-}