Rick3000-
Sounds to me like you got the Euro version cig lighter. You want the US spec one which is deeper and narrower to hold our common access (GPS, cellphone, radar, etc.) The p/n are:
996-652-101-10-A05 Socket ~ $8
996-652-102-10 Lighted retaining ring ~ $5
RandallNeighbour-
The p/n for the trunk light is:
997-632-201-00 (includes the light bulb too
) ~ $3
Prices listed were some Sunset last year so I'm sure they've gone up a bit since then...
Good luck