diff --git a/users/halcyon_modules/rules.mk b/users/halcyon_modules/rules.mk
index a8c7c54c..dfcb8ee0 100644
--- a/users/halcyon_modules/rules.mk
+++ b/users/halcyon_modules/rules.mk
@@ -1,4 +1,5 @@
 # Add this to your existing rules.mk if you have one
-ifneq ($(filter $(strip $(KEYBOARD)), splitkb/halcyon/kyria/rev4),)
+ifneq ($(filter $(strip $(KEYBOARD)), splitkb/halcyon/kyria/rev4 \
+                                      splitkb/halcyon/lily58/rev2),)
 	include $(USER_PATH)/splitkb/rules.mk
 endif
diff --git a/users/halcyon_modules/splitkb/config.h b/users/halcyon_modules/splitkb/config.h
index ffc2afa0..8503cba3 100644
--- a/users/halcyon_modules/splitkb/config.h
+++ b/users/halcyon_modules/splitkb/config.h
@@ -49,7 +49,7 @@
 #endif
 
 // Lily58
-#if PRODUCT_ID == 0xEA1D
+#if defined(KEYBOARD_splitkb_halcyon_lily58_rev2)
     #undef ENCODER_A_PINS
     #define ENCODER_A_PINS { GP23, HLC_ENCODER_A }
     #undef ENCODER_B_PINS
diff --git a/users/halcyon_modules/splitkb/halcyon.c b/users/halcyon_modules/splitkb/halcyon.c
index 86e19b71..cc8fcbfd 100644
--- a/users/halcyon_modules/splitkb/halcyon.c
+++ b/users/halcyon_modules/splitkb/halcyon.c
@@ -179,7 +179,7 @@ const matrix_row_t matrix_mask[] = {
 #endif
 
 // Lily58
-#if PRODUCT_ID == 0xEA1D
+#if defined(KEYBOARD_splitkb_halcyon_lily58_rev2)
 #ifdef RGB_MATRIX_ENABLE
 #include "rgb_matrix.h"
 led_config_t g_led_config = {