diff --git a/modules/emacs/vc/config.el b/modules/emacs/vc/config.el
index 5006e19e9..c2cbfd2bf 100644
--- a/modules/emacs/vc/config.el
+++ b/modules/emacs/vc/config.el
@@ -142,27 +142,6 @@ info in the `header-line-format' is a more visible indicator."
         :n "gtc" #'git-timemachine-show-commit))
 
 
-(use-package! git-commit
-  :hook (doom-first-file . global-git-commit-mode)
-  :config
-  (set-yas-minor-mode! 'git-commit-mode)
-
-  ;; Enforce git commit conventions.
-  ;; See https://chris.beams.io/posts/git-commit/
-  (setq git-commit-summary-max-length 50
-        git-commit-style-convention-checks '(overlong-summary-line non-empty-second-line))
-  (setq-hook! 'git-commit-mode-hook fill-column 72)
-
-  (add-hook! 'git-commit-setup-hook
-    (defun +vc-start-in-insert-state-maybe-h ()
-      "Start git-commit-mode in insert state if in a blank commit message,
-otherwise in default state."
-      (when (and (bound-and-true-p evil-mode)
-                 (not (evil-emacs-state-p))
-                 (bobp) (eolp))
-        (evil-insert-state)))))
-
-
 (after! browse-at-remote
   ;; It's more sensible that the user have more options. If they want line
   ;; numbers, users can request them by making a selection first. Otherwise
diff --git a/modules/emacs/vc/packages.el b/modules/emacs/vc/packages.el
index 18adebb42..2c925ae91 100644
--- a/modules/emacs/vc/packages.el
+++ b/modules/emacs/vc/packages.el
@@ -6,7 +6,6 @@
 (package! smerge-mode :built-in t)
 
 (package! browse-at-remote :pin "76aa27dfd469fcae75ed7031bb73830831aaccbf")
-(package! git-commit :pin "0aa26864e3fc4e6949711a4821caf6819e7ab171")
 (package! git-timemachine
   ;; The original lives on codeberg.org; which has uptime issues.
   :recipe (:host github :repo "emacsmirror/git-timemachine")
diff --git a/modules/tools/magit/config.el b/modules/tools/magit/config.el
index 9ca268930..8ed0f1d03 100644
--- a/modules/tools/magit/config.el
+++ b/modules/tools/magit/config.el
@@ -255,3 +255,24 @@ Only has an effect in GUI Emacs.")
     (undefine-key! magit-section-mode-map "M-1" "M-2" "M-3" "M-4" "1" "2" "3" "4" "0")
     ;; `evil-collection-magit-section' binds these redundant keys.
     (map! :map magit-section-mode-map :n "1" nil :n "2" nil :n "3" nil :n "4" nil)))
+
+
+(use-package! git-commit
+  :hook (doom-first-file . global-git-commit-mode)
+  :config
+  (set-yas-minor-mode! 'git-commit-mode)
+
+  ;; Enforce git commit conventions.
+  ;; See https://chris.beams.io/posts/git-commit/
+  (setq git-commit-summary-max-length 50
+        git-commit-style-convention-checks '(overlong-summary-line non-empty-second-line))
+  (setq-hook! 'git-commit-mode-hook fill-column 72)
+
+  (add-hook! 'git-commit-setup-hook
+    (defun +vc-start-in-insert-state-maybe-h ()
+      "Start git-commit-mode in insert state if in a blank commit message,
+otherwise in default state."
+      (when (and (bound-and-true-p evil-local-mode)
+                 (not (evil-emacs-state-p))
+                 (bobp) (eolp))
+        (evil-insert-state)))))