So Terri gets my desk, and I get her spiffy corner desk, which takes up less room but is higher. It also means I can fit my file cabinet (which I was going to put in the garage) in the office. So it works out okay.
She's putting the desk together now. Once she's done, I can put stuff on it and then actually work in my office! Woo!