NOOO. My MBP came on Friday. Am I screwed?
As long as it wasn't a special config order, you can carry your MBP to an Apple store after they announce the promotion and return it, then purchase it again with the iPod. The promotion simply requires the iPod and CPU must be purchase together on the same receipt. (at least that's how it's been done in the past)
If it was special order, you must return to the Apple Store online, and you'll pay a restocking fee and possibly loose out on upgrades you purchased. Apple online generally refuses to accept RAM once it's been installed.
Your best bet is to go to a physical Apple store. Ask for a manager and explain it to them.