I take back my Apex recommendation--I rebooted, and Apex is in a crash loop, and I can't find anywhere to change my default launcher app (I can get to Settings via the notifications settings screen), nor does Apex show up in the app manager. I don't feel like messing with it now so I just switched over to my CM7 partition.
ETA: I don't think Apex was the problem. On further reboots, I was getting an "updating Android" message before my lockscreen loaded, but it would abort without doing anything. I went ahead and flashed Eyeballer's latest OpenGL build and Apex is working again, though my launcher settings were lost (maybe because it's installed to /system?). Unfortunately, now all my Google apps are crashing, and reflashing the most recent gapps didn't help.