diff --git a/modules/lang/scheme/config.el b/modules/lang/scheme/config.el
index db9d7c96a..7641c8387 100644
--- a/modules/lang/scheme/config.el
+++ b/modules/lang/scheme/config.el
@@ -1,39 +1,42 @@
 ;;; lang/scheme/config.el -*- lexical-binding: t; -*-
 
+;;;###package scheme
 (add-hook 'scheme-mode-hook #'rainbow-delimiters-mode)
 
-(def-package! geiser
-  :mode ("\\.scm\\'" . scheme-mode)
-  :mode ("\\.ss\\'"  . scheme-mode)
-  :commands (geiser)
+
+(use-package! geiser
+  :defer t
   :init
   (setq geiser-active-implementations '(guile chicken mit chibi chez))
-  (set-repl-handler! 'scheme-mode '+scheme/repl)
-  (set-eval-handler! 'scheme-mode #'geiser-eval-region)
-  (set-lookup-handlers! 'scheme-mode
-    :definition #'geiser-edit-symbol-at-point
-    :documentation #'geiser-doc-symbol-at-point)
+  (unless (featurep! :lang racket)
+    (push 'racket geiser-active-implementations))
+  (after! scheme  ; built-in
+    (set-repl-handler! 'scheme-mode '+scheme/repl)
+    (set-eval-handler! 'scheme-mode #'geiser-eval-region)
+    (set-lookup-handlers! 'scheme-mode
+      :definition #'geiser-edit-symbol-at-point
+      :documentation #'geiser-doc-symbol-at-point))
   :config
-  (map! (:localleader
-          (:map scheme-mode-map
-            "'" #'geiser-mode-switch-to-repl
-            "s" #'geiser-set-scheme
+  (map! :localleader
+        :map scheme-mode-map
+        "'" #'geiser-mode-switch-to-repl
+        "s" #'geiser-set-scheme
 
-            (:prefix ("e" . "eval")
-              "b" #'geiser-eval-buffer
-              "B" #'geiser-eval-buffer-and-go
-              "e" #'geiser-eval-definition
-              "E" #'geiser-eval-definition-and-go
-              "r" #'geiser-eval-region
-              "R" #'geiser-eval-region-and-go)
+        (:prefix ("e" . "eval")
+          "b" #'geiser-eval-buffer
+          "B" #'geiser-eval-buffer-and-go
+          "e" #'geiser-eval-definition
+          "E" #'geiser-eval-definition-and-go
+          "r" #'geiser-eval-region
+          "R" #'geiser-eval-region-and-go)
 
-            (:prefix ("h" . "help")
-              "d" 'geiser-autodoc)
-              ;; TODO add more help keybindings
+        (:prefix ("h" . "help")
+          "d" 'geiser-autodoc)
+        ;; TODO add more help keybindings
 
-            (:prefix ("r" . "repl")
-              "b" #'geiser-switch-to-repl
-              "q" #'geiser-repl-exit
-              "r" #'geiser-restart-repl
-              "R" #'geiser-reload
-              "c" #'geiser-repl-clear-buffer)))))
+        (:prefix ("r" . "repl")
+          "b" #'geiser-switch-to-repl
+          "q" #'geiser-repl-exit
+          "r" #'geiser-restart-repl
+          "R" #'geiser-reload
+          "c" #'geiser-repl-clear-buffer)))