diff --git a/core/core-ui.el b/core/core-ui.el
index 1f8424d11..80c6260d2 100644
--- a/core/core-ui.el
+++ b/core/core-ui.el
@@ -317,10 +317,6 @@ read-only or not file-visiting."
 ;;
 ;;; Third party packages
 
-;;;###package avy
-(setq avy-all-windows nil
-      avy-background t)
-
 (def-package! all-the-icons
   :commands (all-the-icons-octicon all-the-icons-faicon all-the-icons-fileicon
              all-the-icons-wicon all-the-icons-material all-the-icons-alltheicon)
diff --git a/core/packages.el b/core/packages.el
index 7e91b39f2..30e583806 100644
--- a/core/packages.el
+++ b/core/packages.el
@@ -23,9 +23,6 @@
 (package! restart-emacs)
 
 ;; core-editor.el
-(package! ace-link)
-(package! ace-window)
-(package! avy)
 (package! better-jumper
   :recipe (:fetcher github :repo "gilbertw1/better-jumper"))
 (package! command-log-mode)
diff --git a/modules/app/twitter/autoload.el b/modules/app/twitter/autoload.el
index 44ed04c1e..cf1d2eb94 100644
--- a/modules/app/twitter/autoload.el
+++ b/modules/app/twitter/autoload.el
@@ -82,6 +82,7 @@ that works with the feature/popup module."
 (defun +twitter/ace-link ()
   "Open a visible link, username or hashtag in a `twittering-mode' buffer."
   (interactive)
+  (require 'avy)
   (let ((pt (avy-with +twitter/ace-link
               (avy--process
                (+twitter--collect-links)
diff --git a/modules/app/twitter/packages.el b/modules/app/twitter/packages.el
index c824062b5..85b1da56d 100644
--- a/modules/app/twitter/packages.el
+++ b/modules/app/twitter/packages.el
@@ -2,3 +2,4 @@
 ;;; app/twitter/packages.el
 
 (package! twittering-mode)
+(package! avy)
diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index e73bb561c..71ea7555e 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -14,6 +14,11 @@
 ;;
 ;;; Reasonable defaults
 
+;;;###package avy
+(setq avy-all-windows nil
+      avy-background t)
+
+
 (after! epa
   (setq epa-file-encrypt-to
         (or epa-file-encrypt-to
diff --git a/modules/config/default/packages.el b/modules/config/default/packages.el
index 1aabc8610..e5f0641cc 100644
--- a/modules/config/default/packages.el
+++ b/modules/config/default/packages.el
@@ -1,6 +1,9 @@
 ;; -*- no-byte-compile: t; -*-
 ;;; config/default/packages.el
 
+(package! avy)
+(package! ace-link)
+
 (unless (featurep! :editor evil)
   (package! winum)
   (package! expand-region))
diff --git a/modules/tools/ein/packages.el b/modules/tools/ein/packages.el
index 19ab85d38..2a449f2cc 100644
--- a/modules/tools/ein/packages.el
+++ b/modules/tools/ein/packages.el
@@ -2,3 +2,4 @@
 ;;; tools/ein/packages.el
 
 (package! ein)
+(package! avy)