diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.h b/esphome/components/dynamic_lamp/dynamic_lamp.h
index 5ef7bdfa59..151d30f5f1 100644
--- a/esphome/components/dynamic_lamp/dynamic_lamp.h
+++ b/esphome/components/dynamic_lamp/dynamic_lamp.h
@@ -2,7 +2,6 @@
 
 #include "esphome/core/component.h"
 #include "esphome/components/output/float_output.h"
-#include "esphome/components/light/light_output.h"
 
 namespace esphome {
 namespace dynamic_lamp {
diff --git a/esphome/components/dynamic_lamp/output/__init__.py b/esphome/components/dynamic_lamp/output/__init__.py
index eade6873c4..a5925d90f6 100644
--- a/esphome/components/dynamic_lamp/output/__init__.py
+++ b/esphome/components/dynamic_lamp/output/__init__.py
@@ -1,7 +1,7 @@
 import esphome.codegen as cg
 from esphome.components import light
 import esphome.config_validation as cv
-from esphome.const import CONF_CHANNEL, CONF_ID
+from esphome.const import CONF_CHANNEL, CONF_OUTPUT_ID
 
 from .. import CONF_DYNAMIC_LAMP_ID, DynamicLampComponent, dynamic_lamp_ns
 
@@ -33,7 +33,7 @@ CHANNEL_OPTIONS = {
 
 CONFIG_SCHEMA = light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend(
     {
-        cv.Required(CONF_ID): cv.declare_id(DynamicLamp),
+        cv.Required(CONF_OUTPUT_ID): cv.declare_id(DynamicLamp),
         cv.GenerateID(CONF_DYNAMIC_LAMP_ID): cv.use_id(DynamicLampComponent),
         cv.Required(CONF_CHANNEL): cv.enum(CHANNEL_OPTIONS, upper=True),
     }
@@ -43,7 +43,7 @@ CONFIG_SCHEMA = light.BRIGHTNESS_ONLY_LIGHT_SCHEMA.extend(
 async def to_code(config):
     parent = await cg.get_variable(config[CONF_DYNAMIC_LAMP_ID])
     var = cg.new_Pvariable(
-        config[CONF_ID],
+        config[CONF_OUTPUT_ID],
         parent,
         config[CONF_CHANNEL],
     )
diff --git a/esphome/components/dynamic_lamp/output/dynamic_lamp_output.h b/esphome/components/dynamic_lamp/output/dynamic_lamp_output.h
index 04a186a9e6..885c80cb9b 100644
--- a/esphome/components/dynamic_lamp/output/dynamic_lamp_output.h
+++ b/esphome/components/dynamic_lamp/output/dynamic_lamp_output.h
@@ -1,8 +1,7 @@
 #pragma once
 
 #include "../dynamic_lamp.h"
-#include "esphome/core/component.h"
-#include "esphome/components/output/float_output.h"
+#include "esphome/components/light/light_output.h"
 
 namespace esphome {
 namespace dynamic_lamp {