diff --git a/core/autoload/os.el b/core/autoload/os.el
deleted file mode 100644
index c77c4eeb5..000000000
--- a/core/autoload/os.el
+++ /dev/null
@@ -1,8 +0,0 @@
-;;; core/autoload/os.el -*- lexical-binding: t; no-byte-compile: t -*-
-
-;; FIXME obsolete :env
-;;;###autoload
-(def-setting! :env (&rest vars)
-  :obsolete set-env!
-  (when (featurep 'exec-path-from-shell)
-    `(exec-path-from-shell-copy-envs ,@vars)))
diff --git a/core/core-os.el b/core/core-os.el
index c1f57ad83..623da3bd0 100644
--- a/core/core-os.el
+++ b/core/core-os.el
@@ -15,6 +15,12 @@
 (defmacro set-env! (&rest _vars)
   "Inject VARS from your shell environment into Emacs.")
 
+;; FIXME obsolete :env
+(def-setting! :env (&rest vars)
+  :obsolete set-env!
+  (when (featurep 'exec-path-from-shell)
+    `(exec-path-from-shell-copy-envs ,@vars)))
+
 (cond (IS-MAC
        (setq mac-command-modifier 'meta
              mac-option-modifier  'alt
diff --git a/core/core.el b/core/core.el
index cf29ad423..60db26474 100644
--- a/core/core.el
+++ b/core/core.el
@@ -342,10 +342,10 @@ to least)."
                 noninteractive)
       (user-error "Your package autoloads are missing! Run `bin/doom refresh' to regenerate them")))
   ;; Initialize Doom core
+  (require 'core-os)
   (unless noninteractive
     (add-hook! 'emacs-startup-hook
       #'(doom|post-init doom|display-benchmark))
-    (require 'core-os)
     (require 'core-ui)
     (require 'core-editor)
     (require 'core-projects)