diff --git a/modules/home/users/msyds/emacs/lisp/syd/evil.el b/modules/home/users/msyds/emacs/lisp/syd/evil.el
index e2cd1a9..9adf200 100644
--- a/modules/home/users/msyds/emacs/lisp/syd/evil.el
+++ b/modules/home/users/msyds/emacs/lisp/syd/evil.el
@@ -35,6 +35,8 @@
         evil-operator-state-cursor 'evil-half-cursor
         evil-insert-state-cursor 'bar
         evil-visual-state-cursor 'hollow
+        ;; Search for symbols rather than words with '*'/'#'.
+        evil-symbol-word-search t
         ;; Only do highlighting in selected window so that Emacs has less work
         ;; to do highlighting them all.
         evil-ex-interactive-search-highlight 'selected-window
@@ -85,6 +87,9 @@ Otherwise, nil."
     "N" #'evil-ex-search-previous
     "*" #'evil-ex-search-word-forward)
 
+  ;; Replace word-wise motion with symbol-wise motion.
+  (defalias 'forward-evil-word 'forward-evil-symbol)
+
   (evil-mode 1))
 
 
diff --git a/modules/home/users/msyds/emacs/lisp/syd/lisp.el b/modules/home/users/msyds/emacs/lisp/syd/lisp.el
index 8c077dc..0f52a16 100644
--- a/modules/home/users/msyds/emacs/lisp/syd/lisp.el
+++ b/modules/home/users/msyds/emacs/lisp/syd/lisp.el
@@ -3,10 +3,6 @@
 (require 'syd/base)
 (require 'syd/evil)
 
-;; Include various lispy symbols as word constituents.
-(dolist (c '(?- ?_ ?? ?! ?+ ?* ?/ ?: ?> ?< ?= ?&))
-  (modify-syntax-entry c "w" lisp-data-mode-syntax-table))
-
 ;;;###autoload
 (defvar-keymap syd-lisp-mode-map
   :doc "Keymap for `syd-lisp-mode'.")