Continuity: Different Apple and iCloud IDs?

I am trying to set up Continuity. When I try to set up the cellular aspect - it tells me that it can't do it because my accounts for FaceTime and iMessage are different from my iCloud ID, which is true.

My FaceTime and iMessage use my Apple ID. This is my ID for App Store and iTunes and so forth.

When iCloud made it's debut (it was @me.com back then) I got one of those accounts - and I've used the iCloud account for maintaining my calendars, contacts, etc. between all my various devices.

So when I downloaded Yosemite tonight, and tried to set up Continuity - it says that it will only work if my Apple ID for FaceTime and iMessage is the same as my iCloud ID.

Does anyone else have this issue?

Obviously it's the way it works. But for a person who uses an Apple ID for FaceTime and iMessage, but not the iCloud account -- Continuity doesn't work. So what is the solution, for me?

Is there a way to merge the Apple ID and the iCloud ID?