Small signal analysis of MOSFET. Calculating Gain
No, Vi is not Vgs, look carefully at the circuit, it's a common drain !
Vi = Vo - Vgs

Also: your small signal equivalent circuit is for a common source while the assignment 4.36 is for a common drain! Note that it is a PMOS with the arrow (indicating the source) at the resistor Rs side.