diff --git a/contrapunctus/cp-lisp.el b/contrapunctus/cp-lisp.el
index 09ef094..d006700 100644
--- a/contrapunctus/cp-lisp.el
+++ b/contrapunctus/cp-lisp.el
@@ -24,10 +24,12 @@
 (setq scheme-program-name "csi -:c")
 (setq comint-prompt-read-only t)
 
-(require 'geiser)
-(require 'geiser-mode)
-(cp-set-keys
- :unset t
- :keymap geiser-mode-map
- :bindings
- `((,(kbd "C-."))))
+(add-to-list 'auto-mode-alist '("\\.scm\\'" . geiser-mode))
+;; (require 'geiser)
+(autoload 'geiser-mode "geiser-mode" "geiser-mode." t)
+(with-eval-after-load 'geiser-mode
+  (cp-set-keys
+   :unset t
+   :keymap geiser-mode-map
+   :bindings
+   `((,(kbd "C-.")))))