diff --git a/modules/editor/god/autoload/god.el b/modules/editor/god/autoload/god.el
index 3245eb1a1..6c8f1d7b7 100644
--- a/modules/editor/god/autoload/god.el
+++ b/modules/editor/god/autoload/god.el
@@ -42,7 +42,7 @@
 initialization.")
 
 ;;;###autoload
-(defun god--configure-cursor-and-modeline ()
+(defun +god--configure-cursor-and-modeline-h ()
   "Configure cursor type, cursor color and doom-modeline bar color depending on mode."
   (let* ((is-fill-overflow (> (current-column) fill-column))
          (previous-cursor-color (face-background 'cursor))
@@ -70,7 +70,7 @@ initialization.")
       (doom-modeline-refresh-bars))))
 
 ;;;###autoload
-(defun god--toggle-on-overwrite ()
+(defun +god--toggle-on-overwrite-h ()
   (if (bound-and-true-p overwrite-mode)
       (god-local-mode-pause)
     (god-local-mode-resume)))
diff --git a/modules/editor/god/config.el b/modules/editor/god/config.el
index 998d83f91..d5d3e9e0d 100644
--- a/modules/editor/god/config.el
+++ b/modules/editor/god/config.el
@@ -1,9 +1,9 @@
 ;;; editor/god/config.el -*- lexical-binding: t; -*-
 
 (use-package! god-mode
-  :commands (god-local-mode god-mode-all)
-  :hook ((after-init . god-mode-all)
-         (post-command . god--configure-cursor-and-modeline)
-         (overwrite-mode . god--toggle-on-overwrite))
+  :commands god-local-mode
+  :hook (doom-after-init-modules . god-mode-all)
   :config
-  (setq god-exempt-major-modes god-default-exempt-major-modes))
+  (setq god-exempt-major-modes god-default-exempt-major-modes)
+  (add-hook! 'post-command-hook #'+god--configure-cursor-and-modeline-h)
+  (add-hook! 'overwrite-mode-hook #'+god--toggle-on-overwrite-h))