diff --git a/advice.el b/advice.el
index 43cd54f..e5f8255 100644
--- a/advice.el
+++ b/advice.el
@@ -2,7 +2,7 @@
 (advice-add 'nix-straight-get-used-packages
             :before (lambda (&rest r)
                       (message "[nix-doom-emacs] Advising doom installer to gather packages to install...")
-                      (advice-add 'doom-reload-autoloads
+                      (advice-add 'doom-cli-reload-autoloads
                                   :override (lambda (&optional file force-p)
                                               (message "[nix-doom-emacs] Skipping generating autoloads...")))
                       (advice-add 'doom--format-print
diff --git a/derivations.lock b/derivations.lock
index 4e7ca61..83ee68b 100644
--- a/derivations.lock
+++ b/derivations.lock
@@ -4,12 +4,12 @@
         "args": {
             "owner": "hlissner",
             "repo": "doom-emacs",
-            "rev": "019308a93c639847dccac75149d407b5a06f6c67",
-            "sha256": "0wqi7m6j1kcjxid651r0p08hswx8yxpshg61358n0jbzl3as1hrk"
+            "rev": "58e674d8fb85515e7980c87fc708dabb2b276128",
+            "sha256": "1algblcah2y5lbrn60fjslszx3jz1p9w7bh82c788ih1d8x7z253"
         },
         "meta": {
-            "updated": "2019-10-25T22:28:24+00:00",
-            "rev": "019308a93c639847dccac75149d407b5a06f6c67"
+            "updated": "2019-11-10T14:33:52+00:00",
+            "rev": "58e674d8fb85515e7980c87fc708dabb2b276128"
         }
     },
     "nix-straight.el": {
diff --git a/fix-paths.patch b/fix-paths.patch
index f6bcd81..145699f 100644
--- a/fix-paths.patch
+++ b/fix-paths.patch
@@ -1,25 +1,15 @@
-diff --git a/bin/doom b/bin/doom
-index bd381e5ab..37cc69569 100755
---- a/bin/doom
-+++ b/bin/doom
-@@ -6,7 +6,7 @@
- ":"; DOOMBASE=$(dirname "$0")/..
- ":"; [ "$1" = -d ] || [ "$1" = --debug ] && { shift; export DEBUG=1; }
- ":"; [ "$1" = doc ] || [ "$1" = doctor ] && { cd "$DOOMBASE"; shift; exec $EMACS --script bin/doom-doctor "$@"; exit 0; }
--":"; [ "$1" = run ] && { cd "$DOOMBASE"; shift; exec $EMACS -q --no-splash -l bin/doom "$@"; exit 0; }
-+":"; [ "$1" = run ] && { cd "$DOOMBASE"; shift; exec $EMACS -q --no-splash -l bin/.doom-wrapped "$@"; exit 0; }
- ":"; exec $EMACS --script "$0" -- "$@"
- ":"; exit 0
- 
 diff --git a/core/core.el b/core/core.el
-index 9cc1cfc25..fcbc3a3cf 100644
+index cb12f8d08..03f370691 100644
 --- a/core/core.el
 +++ b/core/core.el
-@@ -54,20 +54,20 @@ decrease this. If you experience stuttering, increase this.")
+@@ -63,22 +63,21 @@ decrease this. If you experience stuttering, increase this.")
+   "The root directory for Doom's modules. Must end with a slash.")
  
- (defvar doom-local-dir
-   (or (getenv "DOOMLOCALDIR")
--      (concat doom-emacs-dir ".local/"))
+ (defconst doom-local-dir
+-  (if-let (localdir (getenv "DOOMLOCALDIR"))
+-      (expand-file-name (file-name-as-directory localdir))
+-    (concat doom-emacs-dir ".local/"))
++  (or (getenv "DOOMLOCALDIR")
 +      "@local@/")
    "Root directory for local storage.
  
@@ -27,19 +17,19 @@ index 9cc1cfc25..fcbc3a3cf 100644
  These files should not be shared across systems. By default, it is used by
  `doom-etc-dir' and `doom-cache-dir'. Must end with a slash.")
  
--(defvar doom-etc-dir (concat doom-local-dir "etc/")
-+(defvar doom-etc-dir "~/.local/doom"
+-(defconst doom-etc-dir (concat doom-local-dir "etc/")
++(defconst doom-etc-dir "~/.local/doom"
    "Directory for non-volatile local storage.
  
  Use this for files that don't change much, like server binaries, external
  dependencies or long-term shared data. Must end with a slash.")
  
--(defvar doom-cache-dir (concat doom-local-dir "cache/")
-+(defvar doom-cache-dir "~/.cache/doom/"
+-(defconst doom-cache-dir (concat doom-local-dir "cache/")
++(defconst doom-cache-dir "~/.cache/doom/"
    "Directory for volatile local storage.
  
  Use this for files that change often, like cache files. Must end with a slash.")
-@@ -189,7 +189,7 @@ users).")
+@@ -196,7 +195,7 @@ users).")
  (setq abbrev-file-name             (concat doom-local-dir "abbrev.el")
        async-byte-compile-log-file  (concat doom-etc-dir "async-bytecomp.log")
        bookmark-default-file        (concat doom-etc-dir "bookmarks")