diff --git a/cpu/atxmega/Makefile.dep b/cpu/atxmega/Makefile.dep
index b9244839c9..43da1e7f66 100644
--- a/cpu/atxmega/Makefile.dep
+++ b/cpu/atxmega/Makefile.dep
@@ -4,7 +4,7 @@ USEMODULE += atxmega_periph
 # All ATxmega based CPUs provide PM
 USEMODULE += pm_layered
 
-ifeq (,$(filter cpuid,$(USEMODULE)))
+ifneq (,$(filter periph_cpuid,$(USEMODULE)))
   USEMODULE += periph_nvm
 endif
 
diff --git a/cpu/atxmega/periph/Kconfig b/cpu/atxmega/periph/Kconfig
index 663d70970a..8b6a188e2d 100644
--- a/cpu/atxmega/periph/Kconfig
+++ b/cpu/atxmega/periph/Kconfig
@@ -17,6 +17,6 @@ config MODULE_PERIPH_NVM
     bool
     depends on MODULE_ATXMEGA_PERIPH
     depends on HAS_PERIPH_NVM
-    default y if MODULE_CPUID
+    default y if MODULE_PERIPH_CPUID
     help
         Internal ATXmega Non Volatile Memory (NVM) driver.