I'll try installing the driver again. One odd thing I noticed is that when the driver is active and I reboot, the NVIDIA X server option disappears from the menu.

I'll try again now.