diff --git a/home.nix b/home.nix
index 537ad4d..39279c0 100644
--- a/home.nix
+++ b/home.nix
@@ -4,6 +4,8 @@
 
 with lib;
 let
+
+  doom-emacs-package = pkgs.callPackage ./doom-emacs-package.nix {};
   
   gui-packages = with pkgs;
     let
@@ -46,10 +48,10 @@ let
     clj2nix
     cmake
     curl
-    user-doom-emacs
     enca
     file
     fortune
+    doom-emacs-package
     git
     gnutls
     gnupg
@@ -99,10 +101,6 @@ let
   ensure-directories = [ ".emacs.d/.local/etc/eshell" ];
 
 in {
-
-  nixpkgs.overlays = [
-    (import ./package-overlay.nix)
-  ];
   
   programs = {
     bash.enable = true;
@@ -127,7 +125,7 @@ in {
   services = {
     emacs = {
       enable = true;
-      package = doom-emacs;
+      package = doom-emacs-package;
       client = {
         enable = true;
         arguments = [ "-t" ];
diff --git a/package-overlay.nix b/package-overlay.nix
deleted file mode 100644
index 710bc9d..0000000
--- a/package-overlay.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-final: prev: {
-
-  doom-emacs-config = prev.fetchgit {
-    url = "https://git.fudo.org/niten/doom-emacs.git";
-    rev = "0ab1532c856ccdb6ce46c5948054279f439eb1f2";
-    sha256 = "06mh74i5hmb15xid7w31wjc4v339cgddd667bpaphqnw666sm08h";
-  };
-
-  doom-emacs-pkg = prev.fetchgit {
-    url = "https://github.com/vlaci/nix-doom-emacs.git";
-    rev = "fee14d217b7a911aad507679dafbeaa8c1ebf5ff";
-    sha256 = "1g0izscjh5nv4n0n1m58jc6z27i9pkbxs17mnb05a83ffdbmmva6";
-  };
-
-  user-doom-emacs = prev.callPackage final.doom-emacs-pkg {
-    doomPrivateDir = final.doom-emacs-config;
-    extraPackages = with prev.emacsPackages; [
-      elpher
-      use-package
-    ];
-    emacsPackagesOverlay = final: prev: {
-      irony = prev.irony.overrideAttrs (esuper: {
-        buildInputs = esuper.buildInputs
-                      ++ [ prev.cmake prev.libclang prev.clang ];
-      });
-      spinner = let version = "1.7.4";
-      in prev.emacsPackages.trivialBuild {
-        inherit version;
-        pname = "spinner";
-        src = builtins.fetchTarball {
-          url = "https://elpa.gnu.org/packages/spinner-${version}.tar";
-          sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5";
-        };
-        buildPhase = ":";
-      };
-    };
-  };
-}